nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 17:45:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,587 Commits 406 Branches 1,702 Tags
f5245f6b3fdf8f89702458fd7bb2e04e4eacd927
Commit Graph

45587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gursheen Kaur Anand
3f59518d01 chore: resolve conflicts 2023-10-07 15:21:50 +05:30
Gursheen Anand
24b1100c8f test: process soa for gl and ar 
(cherry picked from commit 644e25e587)
 2023-10-07 09:40:32 +00:00
Gursheen Anand
c29eab12df refactor: separate function for statement dict 
(cherry picked from commit 67f878ff8c)

# Conflicts:
#	erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
 2023-10-07 09:40:32 +00:00
Gursheen Anand
15d2024b8e fix: ageing summary in AR 
(cherry picked from commit d9eb44e62d)
 2023-10-07 09:40:32 +00:00
rohitwaghchaure
1480acabb0 feat: validate negative stock for inventory dimension (#37373) 
* feat: validate negative stock for inventory dimension

* test: test case for validate negative stock for inv dimension
 2023-10-06 17:55:32 +05:30
rohitwaghchaure
4c337a6f44 fix: added validation for the batch on stock reco (#37174) 2023-10-06 13:06:13 +05:30
rohitwaghchaure
63f45739e0 fix: incorrect status of the returned purchase receipt (#37300) 2023-10-06 11:58:15 +05:30
ruthra kumar
55a9a8fd51 Merge pull request #37371 from frappe/mergify/bp/version-14-hotfix/pr-37370 
fix: fetch company details for Lead based quotation (backport #37370)
 2023-10-05 14:25:14 +05:30
ruthra kumar
c1d40a6bfa fix: fetch company details for Lead based quotation 
(cherry picked from commit f388864fd5)
 2023-10-05 08:21:26 +00:00
ruthra kumar
bbc13c719e Merge pull request #37367 from frappe/mergify/bp/version-14-hotfix/pr-37359 
refactor: add `access_key` field to facilitate use of exchangerate.host provider (backport #37359)
 2023-10-05 12:57:41 +05:30
ruthra kumar
3b49079ad7 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-37359 2023-10-05 12:17:07 +05:30
ruthra kumar
6fad2bad11 Merge pull request #37369 from frappe/mergify/bp/version-14-hotfix/pr-33593 
feat: disable currency exchange api. (backport #33593)
 2023-10-05 10:25:40 +05:30