nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,709 Commits 401 Branches 1,700 Tags
a166a7676847cc8fe34bb879bfcbf59adeb85e47
Commit Graph

43709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
a166a76768 fix: Multiple rows for same warehouse and batches in pick list (backport #33456) (#33458) 
fix: Multiple rows for same warehouse and batches in pick list (#33456)

(cherry picked from commit d2686ce75b)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2022-12-27 17:49:22 +05:30
mergify[bot]
1edde9c9e0 fix: Random behaviour while picking items using picklist (backport #33449) (#33450) 
fix: Random behaviour while picking items using picklist (#33449)

(cherry picked from commit 8263bf9a9a)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2022-12-27 15:01:31 +05:30
Sagar Sharma
6bf6b8c15e Merge pull request #33445 from frappe/mergify/bp/version-14-hotfix/pr-33437 
fix: `shipping_address` in PO for non-drop ship item (backport #33437)
 2022-12-27 10:16:59 +05:30
s-aga-r
a7a3654541 fix: shipping_address for non-drop shipping item 
(cherry picked from commit 67a7ccf3ce)
 2022-12-26 15:51:29 +00:00
mergify[bot]
e7704b2321 feat: Accounting Dimension updation in Payment Request and Entry (#33411) 2022-12-26 11:34:47 +05:30
mergify[bot]
7a98ece7f1 refactor: Customer and Supplier Ledger summary will have hidden fields for better handling of user permission (#33433) 2022-12-26 10:12:12 +05:30
Sagar Sharma
86e16fd567 Merge pull request #33435 from frappe/mergify/bp/version-14-hotfix/pr-33434 
fix(ux): `shipping_address` in PO (backport #33434)
 2022-12-25 20:45:51 +05:30
s-aga-r
448fbe5582 fix: shipping_address in PO 
(cherry picked from commit 7e1b6b3c2a)
 2022-12-25 14:10:50 +00:00
rohitwaghchaure
cc400abc47 Merge pull request #33423 from frappe/mergify/bp/version-14-hotfix/pr-33422 
fix: timeout error while submitting stock entry (backport #33422)
 2022-12-23 17:19:09 +05:30
Rohit Waghchaure
f30f77cde6 fix: timeout error while submitting stock entry 
Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit a05c47e499)
 2022-12-23 08:28:35 +00:00
ruthra kumar
81d82c1427 Merge pull request #33419 from frappe/mergify/bp/version-14-hotfix/pr-33418 
fix: payment terms and sales partner filter issue in Accounts Receivable report (backport #33418)
 2022-12-22 12:33:52 +05:30
ruthra kumar
0f6790be11 fix: payment terms and sales partner filter issue in AR/AP report 
(cherry picked from commit 13c4420f42)
 2022-12-22 06:36:58 +00:00
ruthra kumar
f6a0435963 Merge pull request #33414 from frappe/mergify/bp/version-14-hotfix/pr-33410 
fix: TypeError on GP Report due to multiple warehouse on bundled items (backport #33410)
 2022-12-21 19:00:55 +05:30
ruthra kumar
007a111847 test: type error on bundled products with different warehouses 
(cherry picked from commit 5918bb03f7)
 2022-12-21 12:58:47 +00:00
ruthra kumar
9b24940059 fix: typerror on multi warehouse in Packed Items 
DN(with bundled item with varying warehouses)-> Sales Invoice.

(cherry picked from commit e684eb32d0)
 2022-12-21 12:58:46 +00:00
mergify[bot]
6ef7eaf82e fix: remove unnecessary permissions from Appointment and Appointment Booking Settings (#33358) (#33395) 2022-12-20 18:23:47 +05:30
Deepesh Garg
647b532e04 Merge pull request #33400 from frappe/mergify/bp/version-14-hotfix/pr-33393 
fix: Cost center filter not working in cash flow report (backport #33393)
 2022-12-20 18:22:30 +05:30
rohitwaghchaure
32f4dfb31e Merge pull request #33391 from frappe/mergify/bp/version-14-hotfix/pr-33382 
fix: unsupported operand type(s) for +=: 'int' and 'NoneType' (backport #33382)
 2022-12-20 17:00:41 +05:30
Deepesh Garg
16ce411b8f fix: Consolidated financial report 2022-12-20 16:48:08 +05:30
Deepesh Garg
a7c7558b68 Merge pull request #33399 from frappe/mergify/bp/version-14-hotfix/pr-33350 
fix: Payment Request flow fixes from Order to Payment Entry (backport #33350)
 2022-12-20 16:17:43 +05:30
Deepesh Garg
a86b8eada9 chore: remove print statement 
(cherry picked from commit 068df9f815)
 2022-12-20 08:16:53 +00:00
Deepesh Garg
ce5065b132 fix: Cost center filter not working in cash flow report 
(cherry picked from commit d0dbfec052)
 2022-12-20 08:16:52 +00:00
Deepesh Garg
d8d5fa6d10 chore: More fixes 
(cherry picked from commit 31c95deb88)
 2022-12-20 08:16:03 +00:00
Deepesh Garg
fa2df8db8c chore: Update test case 
(cherry picked from commit e25b98b620)
 2022-12-20 08:16:03 +00:00
Deepesh Garg
a01db8fc38 fix: Payment Request flow fixes from Order to Payment Entry 
(cherry picked from commit dc178984ae)
 2022-12-20 08:16:03 +00:00
rohitwaghchaure
1f0f6e136b Merge pull request #33389 from frappe/mergify/bp/version-14-hotfix/pr-33387 
fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation (backport #33387)
 2022-12-20 11:47:08 +05:30
Rohit Waghchaure
88dc81b7d4 fix: unsupported operand type(s) for +=: 'int' and 'NoneType' 
(cherry picked from commit 2b4eae5f84)
 2022-12-20 04:18:50 +00:00
Rohit Waghchaure
64b25fba48 test: added test case to validate audit for incorrect entries 
(cherry picked from commit f31612376a)
 2022-12-20 04:17:51 +00:00
Rohit Waghchaure
deb3efdd9a fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation 
(cherry picked from commit b1721b79ce)
 2022-12-20 04:17:51 +00:00
mergify[bot]
fa77259f8d fix: incorrect type hints (backport #33381) (#33384) 
fix: incorrect type hints (#33381)


(cherry picked from commit 88ce11f03d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-12-19 18:01:42 +05:30
Deepesh Garg
71496a56ae Merge pull request #33376 from frappe/mergify/bp/version-14-hotfix/pr-33341 
fix: Cost Center for tax withholding invoices (backport #33341)
 2022-12-17 21:13:07 +05:30
Deepesh Garg
aac567c31c Merge pull request #33377 from frappe/mergify/bp/version-14-hotfix/pr-33339 
feat: more control when printing RFQ (backport #33339)
 2022-12-17 20:06:23 +05:30
barredterra
7ff50b9446 feat: improve visibility of default values 
(cherry picked from commit 8717148d9b)
 2022-12-17 13:55:47 +00:00
barredterra
07cda0aeb5 feat: more control when printing RFQ 
(cherry picked from commit ce9626fead)
 2022-12-17 13:55:47 +00:00
Deepesh Garg
4ea930a9e5 chore: resolve errors in test 
(cherry picked from commit 26277cfcf3)
 2022-12-17 13:55:15 +00:00
Deepesh Garg
728643aa4a fix: Cost Center for tax withholding invoices 
(cherry picked from commit 973ef33eb5)
 2022-12-17 13:55:15 +00:00
Deepesh Garg
cfa6ba1594 Merge pull request #33375 from frappe/mergify/bp/version-14-hotfix/pr-33371 
fix: Unable to import COA through importer (backport #33371)
 2022-12-17 19:22:35 +05:30
Deepesh Garg
f8c09ee720 fix: Unable to import COA through importer 
(cherry picked from commit 3b66920342)
 2022-12-17 11:13:07 +00:00
Deepesh Garg
6c63965b1f Merge pull request #33369 from frappe/mergify/bp/version-14-hotfix/pr-33275 
fix: use highest precision for exchange rate. (backport #33275)
 2022-12-16 16:11:51 +05:30
Devin Slauenwhite
4a8a84d6f0 fix: use highest precision for exchange rate. 
(cherry picked from commit 2010b1b6e8)
 2022-12-16 10:14:23 +00:00
Deepesh Garg
6f16cfa4ca Merge pull request #33366 from frappe/mergify/bp/version-14-hotfix/pr-33362 
feat: Ignore company related doctype for other apps via hooks (backport #33362)
 2022-12-16 12:30:50 +05:30
rohitwaghchaure
c4e80ab9f8 Merge pull request #33359 from frappe/mergify/bp/version-14-hotfix/pr-33355 
fix: disabled items showing in the report Itemwise Recommended Reorder Level (backport #33355)
 2022-12-16 11:39:51 +05:30
Deepesh Garg
cd5a2af272 feat: Ignore company related doctype for other apps via hooks 
(cherry picked from commit 1a40c04b72)
 2022-12-16 05:38:27 +00:00
Rohit Waghchaure
493509e42d fix: disabled items showing in the report 'Itemwise Recommended Reorder Level 
'

(cherry picked from commit ae31ff1c48)
 2022-12-15 12:38:53 +00:00
rohitwaghchaure
beaf9558ef Merge pull request #33356 from frappe/mergify/bp/version-14-hotfix/pr-33354 
fix: unsupported operand type(s) for +: 'int' and 'NoneType' (backport #33354)
 2022-12-15 18:08:45 +05:30
Rohit Waghchaure
7bdfb3d181 fix: unsupported operand type(s) for +: 'int' and 'NoneType' 
(cherry picked from commit 0f28074e5a)
 2022-12-15 11:44:34 +00:00
ruthra kumar
69409233c0 Merge pull request #33351 from frappe/mergify/bp/version-14-hotfix/pr-33335 
fix: paid invoices shows up as outstanding when 'cost_center' filter is applied (backport #33335)
 2022-12-15 17:00:46 +05:30
ruthra kumar
7d1ec5af39 test: cost center should not affect outstanding calculation 
(cherry picked from commit a998a8a2da)
 2022-12-15 09:33:07 +00:00
ruthra kumar
ff61997d25 fix: cost_center filter fix for 'Get Outstanding Invoice' in PE 
(cherry picked from commit 8eb93004f7)
 2022-12-15 09:33:07 +00:00
ruthra kumar
9b2b2812ca fix: cost_center filter gives incorrect output 
filtering on cost center gives invoices that are reconciled as having outstanding

(cherry picked from commit 6d9d730759)
 2022-12-15 09:33:07 +00:00