CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-15 16:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,865 Commits 416 Branches 1,718 Tags
d5bf7a039dfb2fd0b6f151bd4e4df8b4e43279b7
Commit Graph

46865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 8634abc021)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-12 17:41:18 +05:30
mergify[bot]
02e225845e fix(customer): quick form and integration fixes (#37386) 
fix(customer): quick form and integration fixes (#37386)

(cherry picked from commit ae508144cd)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
 2023-11-11 20:19:22 +05:30
mergify[bot]
99b7cdb5be fix: make item field read-only in batch (backport #38010) (#38034) 
fix: make item field read-only in batch

(cherry picked from commit 779260fb49)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-11 10:48:09 +05:30
ruthra kumar
ddb1a7643a Merge pull request #38036 from frappe/mergify/bp/version-15-hotfix/pr-38004 
fix: handling of exchange rate journals in AR/AP (backport #38004)
 2023-11-10 11:59:06 +05:30
ruthra kumar
fb71a6e787 fix: new logic for handling revaluation journals 
(cherry picked from commit 1d8fcd66e6)
 2023-11-10 11:18:59 +05:30
mergify[bot]
40cc3a7610 fix: sales order not assigned to territory orders (backport #37905) (#38025) 
fix: sales order not assigned to territory orders (#37905)

filtered sales order are not assigned to 'territory_orders' which results in 0 order amount and 0 billing amount in the output

(cherry picked from commit 45b4bfc947)

Co-authored-by: jabir-elat <44110258+jabir-elat@users.noreply.github.com>
 2023-11-09 21:52:27 +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 a89afb65d7)

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
 2023-11-09 14:06:46 +05:30
Deepesh Garg
1b103faf05 Merge pull request #38007 from frappe/mergify/bp/version-15-hotfix/pr-37828 
fix: payments irrespective of party types (backport #37828)
 2023-11-09 14:06:14 +05:30
ruthra kumar
54bed25056 Merge pull request #38013 from frappe/mergify/bp/version-15-hotfix/pr-37716 
feat: multi-select customer group in AR Report (backport #37716)
 2023-11-09 13:23:38 +05:30
mergify[bot]
b23fa1f5dd fix: make adjustment entry using stock reconciliation (backport #37995) (#38009) 
fix: make adjustment entry using stock reconciliation (#37995)

fix: do adjustment entry using stock reconciliation
(cherry picked from commit a8216b9727)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-09 13:14:32 +05:30
vishal
b1714ec21d fix: minor change added to test_case 
(cherry picked from commit 30402033bc)
 2023-11-09 07:35:38 +00:00
vishal
848efe8047 feat(accounts_receivable): test_case added for multi-select customer group 
(cherry picked from commit de445b32f5)
 2023-11-09 07:35:38 +00:00
vishal
24be04427c fix: minor issue 
(cherry picked from commit b60c57a97d)
 2023-11-09 07:35:38 +00:00
vishal
fff294fb37 feat: multi-select customer group in AR Report 
(cherry picked from commit 8903c1bc6f)
 2023-11-09 07:35:38 +00:00
Gursheen Anand
2a5b3bdfd9 fix: use get_all instead of get_list 
(cherry picked from commit 2984a86f37)
 2023-11-09 06:46:33 +00:00
Gursheen Anand
74983910bc chore: linting issues 
(cherry picked from commit 84f0d1ff1f)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
6e463b1953 fix: handle gle for standalone credit and debit notes 
(cherry picked from commit 98a8288da2)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
22e58e0ee0 fix: skip check for removed validation 
(cherry picked from commit 0e100cd451)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
ced6d004fb refactor: move common util for fetching party types using account type 
(cherry picked from commit 4867ca353c)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
9781f9b7b1 fix: credit note receive payment entry 
(cherry picked from commit 4015723591)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
46c86de093 test: receive payments from payable party 
(cherry picked from commit cd1e016163)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
a89af589e8 fix: test for invoice returns 
(cherry picked from commit 1f4b381748)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
8602a3eab1 fix: remove validation for negative outstanding invoices 
(cherry picked from commit 3d9938221a)
 2023-11-09 06:46:31 +00:00
ruthra kumar
4eb80ea804 Merge pull request #38002 from frappe/mergify/bp/version-15-hotfix/pr-37860 
refactor: ignore disabled account while selecting Income Accounts (backport #37860)
 2023-11-09 10:41:20 +05:30
ruthra kumar
ef9e8406eb refactor: ignore disabled account while selecting Income Accounts 
(cherry picked from commit 6e3e094c95)
 2023-11-09 04:45:59 +00:00
mergify[bot]
b3562bdb87 fix: asset depreciation ledger (backport #37991) (#37993) 
fix: asset depreciation ledger (#37991)

* fix: include opening acc depr while calculating asset depr ledger report

* chore: include opening acc depr properly in acc depr amt

* chore: add cost_center in asset depr ledger report

* fix: handle finance books properly in asset depr ledger report

* chore: rename 'include default book entries' to 'include default FB entries'

(cherry picked from commit 9a171db97f)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-08 22:52:16 +05:30
mergify[bot]
d74f0ef586 fix: ignore Stock Reservation for future dated PR (backport #37979) (#37990) 
fix: ignore Stock Reservation for future dated PR

(cherry picked from commit 33eedb97dc)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-08 22:20:51 +05:30
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
cbf8a1405a Merge pull request #37976 from frappe/mergify/bp/version-15-hotfix/pr-37971 
refactor: optimize bulk transaction for speed (backport #37971)
 2023-11-08 07:08:58 +05:30
ruthra kumar
3d97a98fd7 refactor: optimize for speed 
(cherry picked from commit 416bd400bb)
 2023-11-08 01:04:08 +00:00
mergify[bot]
3c843c7261 chore: typo in Stock Entry enqueue msg (backport #37970) (#37973) 
chore: typo in `Stock Entry` enqueue msg

(cherry picked from commit ee60fa940c)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-07 21:18:01 +05:30
ruthra kumar
3f25614e54 Merge pull request #37968 from frappe/mergify/bp/version-15-hotfix/pr-37954 
refactor: expand repost to `Expense Claim` and make it configurable (backport #37954)
 2023-11-07 16:09:10 +05:30
ruthra kumar
463e71664c refactor: update permissions for repost settings 
(cherry picked from commit 10b9570429)
 2023-11-07 10:15:24 +00:00
ruthra kumar
b48b858752 refactor(test): repost test case for purchase invoice 
(cherry picked from commit 11c8d9fcf1)
 2023-11-07 10:15:13 +00:00
ruthra kumar
85d255c8a2 refactor: select distinct types 
(cherry picked from commit 61705047b0)
 2023-11-07 10:15:11 +00:00
ruthra kumar
3abee937f9 refactor(test): update repost settings for test cases 
(cherry picked from commit ac79b8483f)
 2023-11-07 10:15:09 +00:00
ruthra kumar
37dbb4d3f9 refactor: support for expense claim repost 
(cherry picked from commit b651b36fff)
 2023-11-07 10:15:08 +00:00
ruthra kumar
1b83a91246 refactor: configurable repost settings 
(cherry picked from commit 5a068410c6)
 2023-11-07 10:15:07 +00:00
ruthra kumar
156d995ad8 chore: patch to update default repost settings value 
(cherry picked from commit ebb186c8df)
 2023-11-07 10:15:06 +00:00
ruthra kumar
c047fd7ac5 feat: settings page for repost 
(cherry picked from commit d582a73795)
 2023-11-07 10:15:05 +00:00
ruthra kumar
dc10a721ab Merge pull request #37958 from frappe/mergify/bp/version-15-hotfix/pr-37956 
fix: type error on new payment entry (backport #37956)
 2023-11-07 12:38:15 +05:30
ruthra kumar
59371358ae fix: type error on new payment entry 
(cherry picked from commit adff287160)
 2023-11-07 06:53:27 +00:00
ruthra kumar
442c484258 Merge pull request #37950 from frappe/mergify/bp/version-15-hotfix/pr-37948 
fix: typo in AR report (backport #37948)
 2023-11-06 20:47:54 +05:30
ruthra kumar
fc3d303b82 fix: typo in AR report 
(cherry picked from commit 67e74d03ed)
 2023-11-06 14:57:21 +00:00
mergify[bot]
915ca47515 fix: add translation wrapper (backport #37911) (#37947) 
fix: add translation wrapper

(cherry picked from commit 8722318081)

Co-authored-by: hyaray <hyaray@vip.qq.com>
 2023-11-06 19:52:04 +05:30
mergify[bot]
a065f22a4c fix: link between parent and child procedure (backport #37903) (#37944) 
* fix: link between parent and child procedure

(cherry picked from commit 05f24ede96)

* chore: add missing filters for `Parent Procedure`

(cherry picked from commit 8fbd4cea5b)

* test: add test case for Quality Procedure`

(cherry picked from commit 30c6b83a10)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-06 19:28:42 +05:30
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 5cce522ecd)

* fix(test): `test_gl_entries_for_standalone_debit_note`

(cherry picked from commit f9fc6c9c9d)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-06 19:27:42 +05:30
mergify[bot]
7ad08179f2 fix: make Material Request Item required if Material Request is set in PO (backport #37928) (#37937) 
fix: make `Material Request Item` required if `Material Request` is set in PO

(cherry picked from commit a9d91189b0)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-06 17:26:18 +05:30
mergify[bot]
df90fd7b35 feat: reserved production plan sub assembly items (backport #37884) (#37927) 
feat: reserved production plan sub assembly items (#37884)

(cherry picked from commit 34d3eb88b3)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-06 11:33:12 +05:30
ruthra kumar
21195343d5 Merge pull request #37925 from frappe/mergify/bp/version-15-hotfix/pr-37879 
refactor: flag to toggle billed amy update in DN for Credit Note (backport #37879)
 2023-11-06 11:24:26 +05:30