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
47,479 Commits 402 Branches 1,702 Tags
14aa9d3d0f3c8a8d8f1328bbf3e3b940b758c3f6
Commit Graph

47479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Kaur Anand
14aa9d3d0f Merge pull request #39564 from frappe/mergify/bp/version-15-hotfix/pr-39557 
fix: make SO item code mandatory (backport #39557)
 2024-01-25 16:39:39 +05:30
Gursheen Anand
171586db9b fix: make SO item code reqd 
(cherry picked from commit 7f8303a493)
 2024-01-25 10:50:38 +00:00
ruthra kumar
c3557a87ef Merge pull request #39552 from frappe/mergify/bp/version-15-hotfix/pr-38218 
fix: honour currency precision while fetching balance (backport #38218)
 2024-01-25 13:25:15 +05:30
mergify[bot]
4853ab1fec fix: default enable closing stock balance (backport #39551) (#39554) 
fix: default enable closing stock balance (#39551)

(cherry picked from commit d1fb90edff)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-25 12:51:55 +05:30
Dany Robert
ed032b3224 chore: avoid explicit escaping for precision 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit a8949174c8)
 2024-01-25 07:00:45 +00:00
Dany Robert
8b7900e6a7 chore: change f-string to sql params 
(cherry picked from commit 383a4b132e)
 2024-01-25 07:00:45 +00:00
Dany Robert
e0a38207f6 fix: honour currency precision while fetching balance 
(cherry picked from commit bfaa93b0ca)
 2024-01-25 07:00:45 +00:00
rohitwaghchaure
e08c7bad63 Merge pull request #39549 from frappe/mergify/bp/version-15-hotfix/pr-39547 
fix: Item Tax template is not working for e-commerce (backport #39547)
 2024-01-25 11:53:30 +05:30
Rohit Waghchaure
2905db19e5 fix: Item Tax template is not working for e-commerce 
(cherry picked from commit 7d3240ae3a)
 2024-01-25 06:07:23 +00:00
ruthra kumar
bd7e8ed230 Merge pull request #39538 from frappe/mergify/bp/version-15-hotfix/pr-39331 
fix: Payment Terms Status for Sales Order report show all payment terms from orders (not only when there is a payment terms template) (backport #39331)
 2024-01-24 16:27:29 +05:30
Florian HENRY
b2e0d24954 fix: Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template 
(cherry picked from commit 6c8f52b26f)
 2024-01-24 10:43:08 +00:00
rohitwaghchaure
84a94cec6b Merge pull request #39531 from frappe/mergify/bp/version-15-hotfix/pr-39525 
fix: email list for auto reorder material request (backport #39525)
 2024-01-24 14:49:28 +05:30
ruthra kumar
871dc6b0da Merge pull request #39533 from frappe/mergify/bp/version-15-hotfix/pr-39529 
fix: AttributeError in company transaction deletion (backport #39529)
 2024-01-24 13:28:22 +05:30
ruthra kumar
222005ca44 fix: AttributeError in company transaction deletion 
(cherry picked from commit b127aa308e)
 2024-01-24 07:40:59 +00:00
Rohit Waghchaure
98c56535d8 fix: email list for auto reorder material request 
(cherry picked from commit 764f3422a0)
 2024-01-24 07:07:16 +00:00
rohitwaghchaure
f6a779e1aa Merge pull request #39527 from frappe/mergify/bp/version-15-hotfix/pr-39521 
fix: not able to edit address through portal (backport #39521)
 2024-01-24 12:17:05 +05:30
Rohit Waghchaure
1f5dbebe68 fix: not able to edit address through portal 
(cherry picked from commit b046d980ad)
 2024-01-24 06:20:31 +00:00
Gursheen Kaur Anand
4073dfb90b Merge pull request #39522 from frappe/mergify/bp/version-15-hotfix/pr-39493 
fix: skip setting liability account for internal transfer (backport #39493)
 2024-01-24 11:08:53 +05:30
Gursheen Anand
e2d85c513c fix: skip liability account for internal transfer 
(cherry picked from commit 236b73565e)
 2024-01-24 05:04:45 +00:00
rohitwaghchaure
880f648846 Merge pull request #39513 from frappe/mergify/bp/version-15-hotfix/pr-39503 
fix: Serial No Ledger permission issue (backport #39503)
 2024-01-24 10:27:23 +05:30
Raffael Meyer
84d2a80f30 Merge pull request #39516 from frappe/mergify/bp/version-15-hotfix/pr-39512 2024-01-23 19:00:53 +01:00
barredterra
fe41e2a341 refactor(Batch): use const instead of var 
(cherry picked from commit 7a7a213285)
 2024-01-23 16:55:27 +00:00
barredterra
a97b8fd876 fix(Batch): reload doc after splitting 
to show updated qty

(cherry picked from commit 34ec2f8a2b)
 2024-01-23 16:55:27 +00:00
barredterra
6ed42e939b refactor: split batch 
(cherry picked from commit 3c7e7a76f0)
 2024-01-23 16:55:26 +00:00
Rohit Waghchaure
f9d1995954 fix: Serial No Ledger permission issue 
(cherry picked from commit 1a670ff266)
 2024-01-23 13:37:35 +00:00
rohitwaghchaure
1331fb75a3 Merge pull request #39496 from frappe/mergify/bp/version-15-hotfix/pr-39478 
fix: UX improvements for Serial and Batch Bundle (backport #39478)
 2024-01-23 13:18:16 +05:30
Rohit Waghchaure
ca93f671df fix: auto create serial no on scan 
(cherry picked from commit fc0d2aeeff)
 2024-01-23 06:27:59 +00:00
Rohit Waghchaure
c76145985d fix: UX improvements for Serial and Batch Bundle 
(cherry picked from commit 5d94f0bde5)
 2024-01-23 06:27:59 +00:00
rohitwaghchaure
a6b4d5b101 Merge pull request #39492 from frappe/mergify/bp/version-15-hotfix/pr-39488 
fix: UOM needs to be whole number not being checked in quotations (backport #39488)
 2024-01-23 11:54:54 +05:30
Rohit Waghchaure
c7d5857014 fix: UOM needs to be whole number not being checked in quotations 
(cherry picked from commit aaf83da3e9)
 2024-01-22 11:55:29 +00:00
Gursheen Kaur Anand
b53e072082 Merge pull request #39483 from frappe/mergify/bp/version-15-hotfix/pr-39462 
fix: party field in PDF for AP / AR reports (backport #39462)
 2024-01-22 17:05:48 +05:30
ruthra kumar
dc88614f89 Merge pull request #39486 from frappe/mergify/bp/version-15-hotfix/pr-39484 
refactor: move 'project' set_query to sales_common.js (backport #39484)
 2024-01-22 16:48:52 +05:30
ruthra kumar
0acbbefa8b refactor: move 'project' set_query to sales_common.js 
(cherry picked from commit 52814724eb)
 2024-01-22 10:21:28 +00:00
Gursheen Anand
9a0834987c fix: party field in pdf html 
(cherry picked from commit b2d9380596)
 2024-01-22 09:51:29 +00:00
ruthra kumar
3e9449d511 Merge pull request #39480 from frappe/mergify/bp/version-15-hotfix/pr-39457 
refactor: delete transactions in background (backport #39457)
 2024-01-22 10:44:04 +05:30
ruthra kumar
80e3597338 refactor: delete transactions in background 
(cherry picked from commit a50808a077)
 2024-01-22 04:28:27 +00:00
rohitwaghchaure
3c84d5ec02 Merge pull request #39479 from frappe/mergify/bp/version-15-hotfix/pr-39476 
fix: added button to make serial / batch from Purchase Invoice (backport #39476)
 2024-01-22 07:36:55 +05:30
Rohit Waghchaure
b0e872aad4 test: fixed test 
(cherry picked from commit 63ffce58cc)
 2024-01-21 16:53:46 +00:00
Rohit Waghchaure
96e1db80ac fix: added button to make serial / batch from Purchase Invoice 
(cherry picked from commit b4393bc03d)
 2024-01-21 16:53:46 +00:00
rohitwaghchaure
35d3edfca4 Merge pull request #39477 from frappe/mergify/bp/version-15-hotfix/pr-39475 
fix: key error during reposting (backport #39475)
 2024-01-21 22:23:26 +05:30
Rohit Waghchaure
b4981f8816 fix: key error during reposting 
(cherry picked from commit ebc8230d45)
 2024-01-21 14:22:36 +00:00
Gursheen Kaur Anand
7c666435a2 Merge pull request #39474 from frappe/mergify/bp/version-15-hotfix/pr-39229 
fix: use most reliable section reference per report line (backport #39229)
 2024-01-21 14:23:12 +05:30
David Arnold
b388adcb2e fix: use most reliable section reference per report line 
(cherry picked from commit b5be17c6df)
 2024-01-21 08:14:55 +00:00
Gursheen Kaur Anand
3ba413a150 Merge pull request #39471 from frappe/mergify/bp/version-15-hotfix/pr-39424 
Revert "fix(minor): financial statements period end date" (backport #39424)
 2024-01-20 18:51:34 +05:30
Gursheen Kaur Anand
ddb84d9036 Revert "fix(minor): financial statements period end date" 
(cherry picked from commit 73625a2622)
 2024-01-20 12:29:27 +00:00
mergify[bot]
00a3ee313b refactor(UX): Accounts workspace cleanup (backport #39232) (#39456) 
* refactor(UX): Accounts workspace cleanup (#39232)

* refactor(UX): Accounts workspace cleanup

* chore: move asset workspace outside accounting

* fix: remove redundant links from parent workspace

* chore: change icons for payable & receivable workspaces

* chore: remove redundant links from subworkspaces

(cherry picked from commit 35067282cf)

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-01-19 12:40:25 +05:30
Gursheen Kaur Anand
f8d7ca515c Merge pull request #39451 from frappe/mergify/bp/version-15-hotfix/pr-39449 
fix: unallocated amount after taxes and charges (backport #39449)
 2024-01-19 10:57:35 +05:30
Gursheen Anand
86f3f62e00 fix: linting issue 
(cherry picked from commit 99b94af49f)
 2024-01-18 10:45:49 +00:00
Gursheen Anand
74613c7fe8 fix: set unallocated amount after base tax 
(cherry picked from commit e9bc63aacf)
 2024-01-18 10:45:49 +00:00
rohitwaghchaure
3244ef3a68 Merge pull request #39443 from frappe/mergify/bp/version-15-hotfix/pr-39436 
fix: duplicate name error while making variant (backport #39436)
 2024-01-18 06:52:17 +05:30