nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 09:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,599 Commits 402 Branches 1,702 Tags
debfbc4761085ade3e2c826e18fef9cecd4dfd5e
Commit Graph

45599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
debfbc4761 refactor: remove references in repost doctypes upon parent doc delet 
(cherry picked from commit ed7f67b1a8)
 2023-10-10 11:01:05 +05:30
Gursheen Anand
3dc68e3b00 fix: validation for si 
(cherry picked from commit 61c6ebbb95)
 2023-10-10 10:58:19 +05:30
Gursheen Anand
bec3e8ed96 fix: call validate before setting repost flag 
(cherry picked from commit 8ef0d88708)
 2023-10-10 10:58:19 +05:30
Gursheen Anand
4123e7b244 fix: do not run bg job for single doc 
(cherry picked from commit 1856050ef9)
 2023-10-10 10:58:19 +05:30
Gursheen Anand
c9bcf79e83 refactor: remove repeated validation for voucher 
(cherry picked from commit a856091ff4)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
 2023-10-10 10:58:19 +05:30
Gursheen Anand
677525b2cf refactor: use repost accounting legder 
(cherry picked from commit 7ebf083683)
 2023-10-10 10:58:19 +05:30
Gursheen Anand
8c83bbc096 refactor: remove unused method 
(cherry picked from commit ba7212c98b)
 2023-10-10 10:58:19 +05:30
Gursheen Anand
a512d27dbb test: reposted acc entries for pi 
(cherry picked from commit c66c438575)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
 2023-10-10 10:58:19 +05:30
Gursheen Anand
6c8a65e03b fix: linting issues 
(cherry picked from commit c88f6d1fa7)
 2023-10-10 10:58:19 +05:30
Gursheen Anand
2d13dda49c feat: allow repost for pi 
(cherry picked from commit 23470bf52d)
 2023-10-10 10:58:19 +05:30
Gursheen Anand
cde848dc7f feat: add repost btn in invoice 
(cherry picked from commit e77814fbc0)
 2023-10-10 10:58:19 +05:30
Gursheen Anand
79e414cb97 refactor: move reposting logic to common controller 
(cherry picked from commit 68effd93bd)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
 2023-10-10 10:58:19 +05:30
Gursheen Anand
f5245f6b3f feat: allow on submit fields 
(cherry picked from commit e922ec60eb)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 2023-10-10 10:58:19 +05:30
ruthra kumar
dc804f216d Merge pull request #37402 from frappe/mergify/bp/version-14-hotfix/pr-36879 
feat: Unreconcile Payments (backport #36879)
 2023-10-10 10:39:54 +05:30
mergify[bot]
24852e46c1 chore: rewrite query using query builder (backport #37310) (#37415) 
* chore: rewrite query using query builder

(cherry picked from commit 25718f5cc7)

* chore: fix shopping cart tests

(cherry picked from commit fb51cae88b)

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-10-09 20:56:43 +05:30
Deepesh Garg
50521d4efe Merge pull request #37322 from frappe/mergify/bp/version-14-hotfix/pr-37119 
chore: add regional support for getting payment entries (#37119)
 2023-10-09 19:28:07 +05:30
ruthra kumar
8fc705ea6a chore: resolve conflicts 2023-10-09 15:17:47 +05:30
ruthra kumar
63274527d2 test: multi currency invoice unreconciliation 
exchange gain/loss associated with the unreconcile invoice should be
cancelled as well

(cherry picked from commit d398775715)
 2023-10-09 06:15:09 +00:00
ruthra kumar
aba51ee352 refactor(test): more modularization 
(cherry picked from commit 5c09fdf941)
 2023-10-09 06:15:09 +00:00
ruthra kumar
4bd83b5058 refactor: cancel gain/loss JE on multi currency transactions 
(cherry picked from commit 1d93d66c30)
 2023-10-09 06:15:09 +00:00
ruthra kumar
75d3093aea refactor: only cancel specific gain/loss je 
(cherry picked from commit 5dbcf7d2b9)
 2023-10-09 06:15:09 +00:00
ruthra kumar
669d692844 refactor: display allocated amount in account currency with symbol 
(cherry picked from commit 6fd1c1bca2)
 2023-10-09 06:15:09 +00:00
ruthra kumar
606c99e57c fix: typo in doctype name and qb 
(cherry picked from commit 9a1588f1cc)
 2023-10-09 06:15:08 +00:00
ruthra kumar
cf308912a1 test: more granular unreconciliation 
(cherry picked from commit 67980188a7)
 2023-10-09 06:15:08 +00:00
ruthra kumar
f5718390b7 refactor: unlink individual vouchers from payments 
(cherry picked from commit 9b6eac23b6)
 2023-10-09 06:15:08 +00:00
ruthra kumar
8954bd7759 chore: type info 
(cherry picked from commit b4dc2bdf28)
 2023-10-09 06:15:08 +00:00
ruthra kumar
3cbaea389b refactor: convert raw sql to query_builder 
(cherry picked from commit 0130aea2aa)
 2023-10-09 06:15:07 +00:00
ruthra kumar
335cb5fd28 refactor: single fetch and unlinking logic for JE and PE 
(cherry picked from commit de910ab152)
 2023-10-09 06:15:07 +00:00
ruthra kumar
cd2d335256 feat: unreconcile support for journal entry 
(cherry picked from commit 285963acdb)
 2023-10-09 06:15:07 +00:00
ruthra kumar
1a69db0f80 refactor: modularisation and group by voucher_no 
(cherry picked from commit cce96669f0)
 2023-10-09 06:15:07 +00:00
ruthra kumar
84e4a2509c chore: rename and add trigger in journal entry 
(cherry picked from commit 0ccb6d8242)
 2023-10-09 06:15:06 +00:00
ruthra kumar
f4e1959cc7 chore: code cleanup 
(cherry picked from commit 69683776a5)
 2023-10-09 06:15:06 +00:00
ruthra kumar
7651ecbc2b chore: fetch logic for payment entry 
(cherry picked from commit 1981f3837a)
 2023-10-09 06:15:06 +00:00
ruthra kumar
e464f5e419 chore: move functions to a separate file in utils 
(cherry picked from commit 25fe752185)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
#	erpnext/public/js/erpnext.bundle.js
 2023-10-09 06:15:06 +00:00
ruthra kumar
1e93d0bcc4 chore: move dialog building function to utils.js file 
(cherry picked from commit 5981c7e0ad)
 2023-10-09 06:15:05 +00:00
ruthra kumar
b886589657 refactor: add UI elements 
(cherry picked from commit 58dc0e52e1)
 2023-10-09 06:15:05 +00:00
ruthra kumar
3a670264b2 chore: delete unreoncile doc upon parent doc deletion 
(cherry picked from commit 6bbe47c671)
 2023-10-09 06:15:05 +00:00
ruthra kumar
2fd500ce26 chore: track changes 
(cherry picked from commit 489a545bbb)
 2023-10-09 06:15:04 +00:00
ruthra kumar
9422422dcc refactor: remove references using framework 
(cherry picked from commit 42df0d3d67)
 2023-10-09 06:15:04 +00:00
ruthra kumar
37fc82cd11 chore: delete references upon parent deletion 
(cherry picked from commit fbdfb8151c)
 2023-10-09 06:15:04 +00:00
ruthra kumar
cb35218eec feat: filter on voucher no 
(cherry picked from commit 41eb2c9f5a)
 2023-10-09 06:15:04 +00:00
ruthra kumar
9531a45b94 feat: UI for unreconcile 
(cherry picked from commit fc6be5bfb9)
 2023-10-09 06:15:03 +00:00
ruthra kumar
fb41f5f88c test: basic unreconcile function 
(cherry picked from commit 0faffaa8db)
 2023-10-09 06:15:03 +00:00
ruthra kumar
b9647ac0a4 refactor: adding 'Get Allocations' button 
(cherry picked from commit 5114a9580d)
 2023-10-09 06:15:03 +00:00
ruthra kumar
77fa0f68df chore: working state on barebones functions 
(cherry picked from commit e48a90efe6)
 2023-10-09 06:15:03 +00:00
ruthra kumar
ae8355c953 feat: introduce unreconcile doctype 
(cherry picked from commit dc71623295)
 2023-10-09 06:15:02 +00:00
ruthra kumar
c42ef922d2 Merge pull request #37396 from frappe/mergify/bp/version-14-hotfix/pr-37395 
fix: exception on exporting errored rows (backport #37395)
 2023-10-08 18:39:49 +05:30
ruthra kumar
e58b3b11e9 fix: exception on exporting errored rows 
(cherry picked from commit d3c6000904)
 2023-10-08 12:52:16 +00:00
ruthra kumar
8f0e10bfbe Merge pull request #37388 from frappe/mergify/bp/version-14-hotfix/pr-37289 
fix: ageing summary in SOA AR (backport #37289)
 2023-10-08 12:25:51 +05:30
Gursheen Kaur Anand
77d719af6e chore: linting issues 2023-10-07 15:40:27 +05:30