Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,941 Commits 3 Branches 0 Tags
Commit Graph

6745 Commits

Author SHA1 Message Date
ruthra kumar
9ee8a78083 refactor: provision to set remarks length in accounts settings 
(cherry picked from commit 97090ff3679104d77a031f29d4acafb8b7ac1580)
 2023-11-20 04:38:26 +00:00
Dany Robert
eab18e6f71 fix: test case for rounded total with cash disc 
(cherry picked from commit cc60c328fe349f7d53c77799e8e91973c2790746)
 2023-11-19 13:49:19 +00:00
Devin Slauenwhite
384d6b516c fix: payment entry rounding error 
(cherry picked from commit 3d1e3a9cded735c420cb6c0ceb17c62034983076)
 2023-11-19 13:17:51 +00:00
mergify[bot]
20e15ebd22
fix: allow regional gl in payment entry for gl preview (#38136) 
fix: allow regional gl in payment entry for gl preview (#38136)

(cherry picked from commit 7e43d7b1312fd665bdcde7db7c67d192f746e60a)

Co-authored-by: Smit Vora <smitvora203@gmail.com>
 2023-11-17 12:40:18 +05:30
Deepesh Garg
d51237195a
fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#38123) 
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt

* test: Update tests
 2023-11-16 13:38:10 +05:30
Gursheen Anand
cb4bb5b4ee fix: test total unallocated amount in payment 
(cherry picked from commit 2499675ad121ab370f672e6f9ffdcda3c8c76b8e)
 2023-11-16 05:07:00 +00:00
Gursheen Anand
376e09680c test: payment against partial return invoices 
(cherry picked from commit 09f9764bbdec90d1b9f85ccc5a368bf85547bea1)
 2023-11-16 05:07:00 +00:00
Gursheen Anand
22b39ac4b4 fix: reset dr_or_cr for every reference 
(cherry picked from commit a59c942cd487e0440625663034760eb89171e2ef)
 2023-11-16 05:06:59 +00:00
Gursheen Anand
ac61abb2e4 fix: handle partial return against invoices 
(cherry picked from commit 5b446d45750c45c6a86bb420c689a06945ab4974)
 2023-11-16 05:06:59 +00:00
mergify[bot]
77b1eedcf4
chore: refetch item images on transaction save (backport #38095) (#38099) 
chore: refetch item images on transaction save (#38095)

chore: re fetch item images on transaction save
(cherry picked from commit e93a19ffb5d45a3bf0136ca3fc24a828b008aeee)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-14 20:11:19 +05:30
mergify[bot]
d5bf7a039d
fix: COA Importer app related issues (#37238) 
fix: COA Importer app related issues (#37238)

* fix: COA Importer app related issues

* fix: Clear all account links fields befor import

* fix: Attribute error

(cherry picked from commit 8634abc0210fdb259c8b0e7ffc93976ea0099057)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-12 17:41:18 +05:30
mergify[bot]
3c0f8b15a0
fix: Mark Status field in Payment Entry 'no_copy'. (#38000) 
fix: Mark Status field in Payment Entry 'no_copy'.

(cherry picked from commit a89afb65d72b7beb985449151b25fc678b4c6891)

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
 2023-11-09 14:06:46 +05:30
Gursheen Anand
6e463b1953 fix: handle gle for standalone credit and debit notes 
(cherry picked from commit 98a8288da2e2516153e30a2e028104f220df3644)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
22e58e0ee0 fix: skip check for removed validation 
(cherry picked from commit 0e100cd451892f3024d031ca7b45964c533cdc26)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
9781f9b7b1 fix: credit note receive payment entry 
(cherry picked from commit 40157235916578ae88d2ec9a85f481c92fec9278)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
46c86de093 test: receive payments from payable party 
(cherry picked from commit cd1e016163141a4851b9128a2ff008809942482e)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
a89af589e8 fix: test for invoice returns 
(cherry picked from commit 1f4b38174899d99be2a3ac894a328c6b7ae7475f)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
8602a3eab1 fix: remove validation for negative outstanding invoices 
(cherry picked from commit 3d9938221a7fef7e08c0072364d8ebb855933d11)
 2023-11-09 06:46:31 +00:00
ruthra kumar
ef9e8406eb refactor: ignore disabled account while selecting Income Accounts 
(cherry picked from commit 6e3e094c957d8c2b71ed522e9a8034364345e5a7)
 2023-11-09 04:45:59 +00:00
ruthra kumar
0e979b6c5b
Merge pull request #37902 from frappe/mergify/bp/version-15-hotfix/pr-37887 
chore: performance optimization on payment ledger entry doctype (backport #37887)
 2023-11-08 10:13:55 +05:30
ruthra kumar
463e71664c refactor: update permissions for repost settings 
(cherry picked from commit 10b9570429e16906f3f879228c065b668f63882b)
 2023-11-07 10:15:24 +00:00
ruthra kumar
b48b858752 refactor(test): repost test case for purchase invoice 
(cherry picked from commit 11c8d9fcf1e7eef1890b719b37c823822b6a108d)
 2023-11-07 10:15:13 +00:00
ruthra kumar
85d255c8a2 refactor: select distinct types 
(cherry picked from commit 61705047b037f91a735207d18635de6263af804d)
 2023-11-07 10:15:11 +00:00
ruthra kumar
3abee937f9 refactor(test): update repost settings for test cases 
(cherry picked from commit ac79b8483f0769ab7fd3dc4975b7be34e15b32b2)
 2023-11-07 10:15:09 +00:00
ruthra kumar
37dbb4d3f9 refactor: support for expense claim repost 
(cherry picked from commit b651b36fff496a92713f634868a63a4ebe24f8c9)
 2023-11-07 10:15:08 +00:00
ruthra kumar
1b83a91246 refactor: configurable repost settings 
(cherry picked from commit 5a068410c6ff4bc4ac100098c712d09bb70854df)
 2023-11-07 10:15:07 +00:00
ruthra kumar
c047fd7ac5 feat: settings page for repost 
(cherry picked from commit d582a7379580367e7d81bed58ed02773bd15d00c)
 2023-11-07 10:15:05 +00:00
ruthra kumar
59371358ae fix: type error on new payment entry 
(cherry picked from commit adff2871606c8f0ed51971cd65db355d38032fb9)
 2023-11-07 06:53:27 +00:00
mergify[bot]
e156564ea4
fix: don't reset rate if greater than zero in standalone debit note (backport #37935) (#37941) 
* fix: don't reset rate if greater than zero in standalone debit note

(cherry picked from commit 5cce522ecdb7f13a001d4abbf6c3682088edb1b6)

* fix(test): `test_gl_entries_for_standalone_debit_note`

(cherry picked from commit f9fc6c9c9d5faef90f345df6e04ea4d2b8b8b69b)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-06 19:27:42 +05:30
ruthra kumar
463accbf04 refactor: flag to toggle billed amy update in DN for Credit Note 
(cherry picked from commit a3191f1c8c08c5723d35f4cf05d44f123ec4ca2e)
 2023-11-06 03:11:52 +00:00
mergify[bot]
fd7a768535
fix: POS change amount gl entry with no amount (#37799) 
fix: POS change amount gl entry with no amount (#37799)

(cherry picked from commit 2b02ef00664b12812a99059bd9a29827231fdd94)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-05 17:56:45 +05:30
ruthra kumar
65f23485d3 chore: performance optimization on payment ledger entry doctype 
(cherry picked from commit f14d1eb8716e1a816af4ed69f9dd1f6a4d30f035)
 2023-11-04 03:27:51 +00:00
mergify[bot]
febd20acbc
perf: index return against for purchase invoice (backport #37881) (#37883) 
perf: index return against for purchase invoice (#37881)

(cherry picked from commit 469ae2c7f1edb6dbd2d770b65c48bad5a0293ffe)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-11-03 21:59:49 +05:30
mergify[bot]
b1982a6961
perf: Add index to supplier invoice field (backport #37861) (#37863) 
fix: Add index to supplier invoice field (#37861)

* fix: Add index to supplier invoice field

* chore: remove unintetional changes

(cherry picked from commit c37e374fdd322c0f0423469ce95faecac15b18e4)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-03 11:52:32 +05:30
ruthra kumar
7524e425da chore: std permissions for Process Payment Reconciilation log 
(cherry picked from commit a9fceeb00ff266b181791dc0ca4ca334810fff0a)
 2023-11-02 06:16:07 +00:00
ruthra kumar
8ef48bc6b7 refactor: pass limits to JE and PE queries in reconciliation tool 
(cherry picked from commit 54e8ce1ac5a0d14905050fbb630a1602a560088a)
 2023-11-02 05:13:38 +00:00
Deepesh Garg
2ba5bb8abc
Merge pull request #37718 from frappe/mergify/bp/version-15-hotfix/pr-37690 
fix(plaid): Do not sync pending transactions (#37690)
 2023-11-01 14:10:17 +05:30
ruthra kumar
f64fdb6870 chore: add index to posting_date in PLE 
(cherry picked from commit ca698452382eba85bd940dfb6344ff19d1eab4e4)
 2023-10-30 11:20:03 +00:00
mergify[bot]
4034c16cde
chore: fixed test cases related to Internal Transfer (backport #37659) (#37733) 
* chore: fixed test cases related to Internal Transfer (#37659)

(cherry picked from commit 72d32a49012329d33fd4ecea70988fbfbfce566f)

* chore: fix test cases

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-28 13:31:29 +05:30
mergify[bot]
b03c65f21d
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (backport #37721) (#37731) 
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (#37721)

(cherry picked from commit fd78f868e1aed2bdb3baa47927f37b239e16a174)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-28 11:10:46 +05:30
mergify[bot]
a3d3c0024e
chore: allow wip_composite_asset in the MR PO PR PI flow (copy #37723) (#37724) 
* chore: allow wip_composite_asset in the MR PO PR PI flow

(cherry picked from commit 0e5bea33a320497d2de3253ca0e1bb061a07130f)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflict

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-10-27 18:54:43 +05:30
Deepesh Garg
2149de44b1 fix(plaid): Do not sync pending transactions 
(cherry picked from commit 46ea8685590e81266beb1cccbe72925f28bc42ba)
 2023-10-27 06:09:09 +00:00
Ankush Menat
5cca001a58 fix: Correctly extract last message (#37602) 
frappe.message_log now contains plain dictionary and not JSON strings,
so no need to load them.
 2023-10-20 17:28:55 +05:30
Smit Vora
844e6f47df fix: add regional support to extend purchase gl entries 2023-10-20 17:28:42 +05:30
mergify[bot]
62d9de4848
fix: incorrect cost center in the purchase invoice (backport #37591) (#37608) 
fix: incorrect cost center in the purchase invoice (#37591)

(cherry picked from commit 14b009b09355f53b1dfcd05d0f7ba918b0b25210)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-20 17:03:51 +05:30
Deepesh Garg
6750af90f7
Merge pull request #37562 from GursheenK/subscription-tax-filters 
fix(minor): filter tax template based on company in subscription
 2023-10-18 17:49:09 +05:30
Gursheen Anand
1a2f659de2 fix: filter tax template based on company 2023-10-18 11:42:19 +05:30
Deepesh Garg
88be7ada33 Merge branch 'develop' of https://github.com/frappe/erpnext into sales_order_item_dimensions 2023-10-17 18:30:49 +05:30
Deepesh Garg
e31db18912 chore: Add accounting dimensions to Sales Order Item table 2023-10-17 18:19:47 +05:30
Sabu Siyad
f900a78995
refactor!: drop ecommerce in favor of webshop (#33265) 
* refactor!: remove ecommerce item group field check

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `e_commerce` directory

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `get_context` from `item_group`

https://frappeframework.com/docs/v14/user/en/guides/portal-development/context

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove related `./templates`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(navbar): remove wishlist (ecommerce)

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(js): remove js from scripts

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `www/all-products`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove pages and js

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove js/customer_reviews

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(portal utils): remove shopping cart debtor account

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove e_commerce events from hooks

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(web): remove e_commerce js from bundle

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(setup): remove shopping cart setup

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove pages

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(item): remove website item button

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(payment request): remove `on_payment_authorized`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: @staticmethod `get_gateway_details`

to avoid monkey patching, in custom apps
https://discuss.erpnext.com/t/how-to-override-method-in-frappe/28786/36

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(pages): remove product page

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(homepage): do not setup website items

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(workspace): remove link to ecommerce settings

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(www): remove shop-by-category

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(homepage): remove featured product

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: remove products in homepage

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(homepage): remove explore button

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: remove products fields from homepage

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* Revert "refactor!: @staticmethod `get_gateway_details`"

This reverts commit 561bcd96680a930bb92627869502d9346b10611b.

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove payment gateway e_commerce import

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* chore: pre-commit

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: pass `party` into `get_price`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: move `get_item_codes_by_attributes` to `utilities/product`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(quotation): input customer group

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* chore: pre-commit

* refactor: remove custom `navbar_items.html`

* refactor!(item): remove `published_in_website`

* refactor: move `validate_duplicate_website_item` before rename

* test: remove `test_shopping_cart_without_website_item`

* chore: add doctype drop patch

* refactor: removed website item related code

* refactor: removed shopping_cart code

* refactor: removed e-commerce related patches

* refactor: removed website related fields from item group

* fix: patch create_asset_depreciation_schedules_from_assets, KeyError: '0K BU64 AUY'

---------

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2023-10-17 17:05:44 +05:30