nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-22 02:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,349 Commits 403 Branches 1,702 Tags
6edfcf4de82156be6e2ef2204e264e59a2d3b6eb
Commit Graph

45349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
6edfcf4de8 fix: SCR return status (backport #36793) (#36796) 
fix: SCR return status (#36793)

(cherry picked from commit 723563c167)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-08-24 10:42:59 +05:30
mergify[bot]
4fa07777e9 feat(MR): Project and Cost Center in Connections (backport #36794) (#36795) 
feat(MR): Project and Cost Center in Connections (#36794)

(cherry picked from commit 54ffe41b54)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-08-24 10:15:05 +05:30
ruthra kumar
b1ebd81f77 Merge pull request #36778 from frappe/mergify/bp/version-14-hotfix/pr-36650 
perf: improve responsiveness of payment reconciliation tool (backport #36650)
 2023-08-23 15:08:47 +05:30
ruthra kumar
20c45c7975 chore: linter fix 2023-08-23 14:15:35 +05:30
ruthra kumar
4a4cba0715 chore: resolve conflict 2023-08-23 13:22:10 +05:30
ruthra kumar
ab9da5281e refactor: filter for journal entries 
(cherry picked from commit d01f0f2e96)
 2023-08-23 03:43:29 +00:00
ruthra kumar
c5080abd46 refactor: filter on advance payments 
(cherry picked from commit 86bac2cf52)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
#	erpnext/controllers/accounts_controller.py
 2023-08-23 03:43:29 +00:00
ruthra kumar
a8c53eeb93 refactor: filter on cr/dr notes 
(cherry picked from commit 52f609e67a)
 2023-08-23 03:43:28 +00:00
ruthra kumar
d727a13562 refactor: trigger on value change 
(cherry picked from commit e48f8139eb)
 2023-08-23 03:43:28 +00:00
ruthra kumar
4556c36736 refactor: limit output to 50 in reconciliation tool 
(cherry picked from commit 7a381affce)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
 2023-08-23 03:43:28 +00:00
Deepesh Garg
f16386bd07 Merge pull request #36776 from frappe/mergify/bp/version-14-hotfix/pr-36758 
fix: Accounts Payable Currency bug (#36758)
 2023-08-22 22:37:39 +05:30
RitvikSardana
94612b90ef fix: Accounts Payable Currency bug 
(cherry picked from commit 9349bc77c5)
 2023-08-22 17:00:23 +00:00
rohitwaghchaure
6a9935c00e fix: Procurement Tracker report not showing material request items (#36768) 2023-08-22 19:25:50 +05:30
rohitwaghchaure
873ee384a1 fix: not able to make stock entry (#36759) 2023-08-22 16:57:08 +05:30
Deepesh Garg
13b1263723 Merge pull request #36738 from frappe/mergify/bp/version-14-hotfix/pr-36737 
fix: add missing items label back (#36737)
 2023-08-22 07:58:41 +05:30
ruthra kumar
6761874e28 Merge pull request #36749 from frappe/mergify/bp/version-14-hotfix/pr-36748 
chore: clean up stale code in reconciliation tool (backport #36748)
 2023-08-22 06:47:41 +05:30
ruthra kumar
19eb6af65f chore: clean up stale code in reconciliation tool 
(cherry picked from commit e93b927051)
 2023-08-22 00:50:48 +00:00
ruthra kumar
0dc0e287a3 Merge pull request #36741 from frappe/mergify/bp/version-14-hotfix/pr-36727 
fix: broken advance field in Accounts Receivable summary rpt (backport #36727)
 2023-08-22 06:05:54 +05:30
Anand Baburajan
a0575ed2b0 fix: incorrect schedule in asset value adjustment (#36725) 
* fix: incorrect schedule in asset value adjustment

* chore: remove unnecessary commented code

* test: check schedules in test

* test: improving the test

* chore: better function name

* chore: use None instead of 0 for default value after depr

* chore: typo
 2023-08-22 01:40:42 +05:30
ruthra kumar
cb9aad3e87 fix: incorrect gl balance on multi company setup 2023-08-21 21:35:26 +05:30
ruthra kumar
37cee42561 test: add test for receivable summary report 
(cherry picked from commit af52f21ece)
 2023-08-21 15:24:11 +00:00
ruthra kumar
928e475824 refactor: use payment ledger to fetch advance amount 
(cherry picked from commit 0dc5e5c430)
 2023-08-21 15:24:11 +00:00
ruthra kumar
296a4d7a12 fix: broken advance field in Accounts Receivable summary rpt 
(cherry picked from commit 896b123fb1)
 2023-08-21 15:24:10 +00:00
ruthra kumar
fe78076cde Merge pull request #36740 from frappe/mergify/bp/version-14-hotfix/pr-36728 
fix: include gain/loss journal in AR/AP reports (backport #36728)
 2023-08-21 20:20:35 +05:30
Deepesh Garg
d082e68e83 Merge pull request #36707 from frappe/mergify/bp/version-14-hotfix/pr-36149 
fix: make offsetting entry for acc dimensions in general ledger (#36149)
 2023-08-21 18:02:56 +05:30
ruthra kumar
4606079568 fix: include gain/loss journal in AR/AP reports 
(cherry picked from commit e3104f1898)
 2023-08-21 11:53:41 +00:00
Ankush Menat
3634e80341 fix: add missing items labels back (#36737) 
[skip ci]

(cherry picked from commit 86cac1e1d2)
 2023-08-21 10:37:24 +00:00
mergify[bot]
e1bd9a7e8d fix: don't throw if item does not have default BOM (backport #36709) (#36734) 
* fix: don't throw if item does not have default BOM

(cherry picked from commit 268c19e745)

* fix: throw if `BOM No` is not set

(cherry picked from commit 2e22b019a0)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-08-21 15:21:11 +05:30
Deepesh Garg
72d9dc6c85 chore: resolve more conflicts 2023-08-21 10:04:20 +05:30
Deepesh Garg
9ec11d9502 Merge pull request #36726 from frappe/mergify/bp/version-14-hotfix/pr-36696 
fix: mode of payment fetched from pos profile company in POS (#36696)
 2023-08-20 16:05:05 +05:30
Deepesh Garg
2f92981afe chore: resolve conflicts 2023-08-20 15:47:17 +05:30
Ritvik Sardana
c74a414313 fix: mode of payment fetched from pos profile company in POS 
(cherry picked from commit 1bdd43d0f6)
 2023-08-20 10:07:56 +00:00
ruthra kumar
e8f1c82089 Merge pull request #36672 from frappe/mergify/bp/version-14-hotfix/pr-36469 
feat: utility to repost accounting ledgers without cancellation (backport #36469)
 2023-08-19 19:54:55 +05:30
ruthra kumar
6366f5aadb Merge pull request #36679 from frappe/mergify/bp/version-14-hotfix/pr-36649 
perf: pull latest details only for referenced vouchers (backport #36649)
 2023-08-19 19:29:00 +05:30
Deepesh Garg
933d4bfceb Merge pull request #36711 from frappe/mergify/bp/version-14-hotfix/pr-36710 
fix: broken consolidated report due to finance book filter (#36710)
 2023-08-19 10:25:11 +05:30
rohitwaghchaure
620b21fec5 fix: timeout error coming during reposting (#36715) 2023-08-18 18:33:04 +05:30
ruthra kumar
5bd2a0923f fix: broken consolidated report due to finance book filter 
(cherry picked from commit 96847db0ec)
 2023-08-18 09:25:18 +00:00
Deepesh Garg
e62ffa990d fix: Add company filters for account 
(cherry picked from commit ecca9cb023)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
 2023-08-18 07:08:21 +00:00
Gursheen Anand
01ae513f70 fix: dimension name in remark 
(cherry picked from commit 4f9242d699)
 2023-08-18 07:08:21 +00:00
Gursheen Anand
37ef6e959b fix: reset dimension defaults when company changedin test 
(cherry picked from commit 3f5afb9cac)
 2023-08-18 07:08:21 +00:00
Gursheen Anand
2a467a9fbf fix: clear dimension defaults after test 
(cherry picked from commit 23e56d3ec1)
 2023-08-18 07:08:20 +00:00
Gursheen Anand
7ac35b496a fix: fetch acc dimensions correctly when fieldname is different from name 
(cherry picked from commit e19a6f5dcb)
 2023-08-18 07:08:20 +00:00
Gursheen Anand
cdb66bf198 fix: duplicate acc dimension in test 
(cherry picked from commit b3f6d991b5)
 2023-08-18 07:08:20 +00:00
Gursheen Anand
8530a28c62 test: PI offsetting entry for accounting dimension 
(cherry picked from commit 77deac4fb9)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
 2023-08-18 07:08:20 +00:00
Gursheen Anand
2c8c3a022c fix: divide offsetting amount only when account exists 
(cherry picked from commit 3a3ffa2307)
 2023-08-18 07:08:19 +00:00
Gursheen Anand
1269f2d301 fix: divide offsetting amount for multiple dimensions 
(cherry picked from commit 1e1e4b93c1)
 2023-08-18 07:08:19 +00:00
Gursheen Anand
11ba553dbd fix: dict value for dimension for gl entries defined without the dimension 
(cherry picked from commit ed3bef1840)
 2023-08-18 07:08:19 +00:00
Gursheen Anand
248d4082c0 test: TB report balanced whenfiltered using acc dimension 
(cherry picked from commit 4004427892)
 2023-08-18 07:08:19 +00:00
Gursheen Anand
f578c3219d fix: make offsetting entry for all doctypes 
(cherry picked from commit 22ba12172f)
 2023-08-18 07:08:18 +00:00
Gursheen Anand
c1f1a21714 fix: fetch accounting dimension details specific to company 
(cherry picked from commit 4e09de4db2)
 2023-08-18 07:08:18 +00:00