schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,614 Commits 322 Branches 1,581 Tags
57f4eb121c46ad66138bbdc2f381d9b9f47d8a3c
Commit Graph

46614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Anand
57f4eb121c test: sales person target variance 
(cherry picked from commit 7566c1ee78)
 2024-02-26 05:09:41 +00:00
Gursheen Anand
89d19422d1 feat: show contributed qty in transaction summary 
(cherry picked from commit a823f16dff)
 2024-02-26 05:09:40 +00:00
Gursheen Anand
0484857402 fix: only consider contributed qty towards achieved targets 
(cherry picked from commit 339698d172)
 2024-02-26 05:09:40 +00:00
ruthra kumar
b3735d29bf Merge pull request #40090 from frappe/mergify/bp/version-14-hotfix/pr-40073 
refactor: update payments section on item removal (backport #40073)
 2024-02-25 09:29:51 +05:30
ruthra kumar
4bc6c55198 refactor: update payments section on item removal 
(cherry picked from commit 406793a6ff)
 2024-02-25 03:57:39 +00:00
mergify[bot]
e461185317 fix: do not make MR against raw materials of available sub assemblies (backport #40085) (#40086) 
fix: do not make MR against raw materials of available sub assemblies (#40085)

(cherry picked from commit 4c9048fb39)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-24 21:02:45 +05:30
mergify[bot]
579b27d010 fix: Cannot read properties of undefined (backport #40081) (#40082) 
* fix: Cannot read properties of undefined

(cherry picked from commit 44ed52c5cf)

* chore: fix linter issue

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-02-24 17:22:37 +05:30
ruthra kumar
2b01b102b4 Merge pull request #40067 from frappe/mergify/bp/version-14-hotfix/pr-39830 
fix: check_credit_limit on_update_after_submit of Sales Order (backport #39830)
 2024-02-23 14:50:25 +05:30
ruthra kumar
db7c360fa1 test: credit limit on update after submit 
(cherry picked from commit 467c0898e9)
 2024-02-23 08:51:38 +00:00
Nihantra C. Patel
3112fca087 fix: check_credit_limit on_update_after_submit of Sales Order 
(cherry picked from commit 17452b7693)
 2024-02-23 08:51:38 +00:00
Ankush Menat
96703fb34d build: specify frappe dependency (#40060) 2024-02-23 12:42:10 +05:30
ruthra kumar
05a9f766bc Merge pull request #40057 from frappe/mergify/bp/version-14-hotfix/pr-40011 
fix: Ledger entries for Cr/Dr notes with POS Payments (backport #40011)
 2024-02-23 06:20:46 +05:30
ruthra kumar
6eb7a18591 Merge pull request #40055 from frappe/mergify/bp/version-14-hotfix/pr-39831 
fix: remove cancelled payment entry from Payment Period Based On Invoice Date (backport #39831)
 2024-02-23 06:20:06 +05:30
ruthra kumar
9e9486d5ab refactor: skip popup for POS invoices 
(cherry picked from commit 3634c4c284)
 2024-02-23 00:33:09 +00:00
ruthra kumar
a9791c85c7 test: ledger entries of Cr Note of POS Invoice 
(cherry picked from commit 4288713abe)
 2024-02-23 00:33:09 +00:00
ruthra kumar
e5098c521b fix: Cr/Dr notes with POS Payments 
(cherry picked from commit 68a23730f3)
 2024-02-23 00:33:08 +00:00
Nihantra C. Patel
a1c0c2359f fix: remove cancelled payment entry from PPBOID report 
(cherry picked from commit 186cc3d748)
 2024-02-23 00:30:49 +00:00
Nihantra C. Patel
2fc490a5d7 fix: remove cancelled payment entry from Payment Period Based On Invoice Date 
(cherry picked from commit a2a8a8f2e0)
 2024-02-23 00:30:48 +00:00
ruthra kumar
9630dc7b88 Merge pull request #40048 from frappe/mergify/bp/version-14-hotfix/pr-39828 
fix: translate Sales Pipeline Analytics report (backport #39828)
 2024-02-22 20:47:16 +05:30
Nihantra C. Patel
3c170b9805 fix: translatable columns in Sales Pipeline Analytics report 
(cherry picked from commit c5050c935b)
 2024-02-22 14:54:51 +00:00
rohitwaghchaure
9d723df9b2 Merge pull request #40041 from rohitwaghchaure/fixed-not-able-to-view-pages 
fix: Webpages not working without login
 2024-02-22 16:51:25 +05:30
Rohit Waghchaure
d6fad08d20 fix: Webpages not working without login 2024-02-22 16:24:30 +05:30
mergify[bot]
b364fe7047 fix: communication_date in party dashboards (backport #40005) (#40020) 
fix: accommodate for changed orderby statement

(cherry picked from commit 87df7ff717)

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
 2024-02-22 16:20:15 +05:30
mergify[bot]
2a2f314821 fix: timesheet per billed state edge case (backport #40010) (#40028) 
fix: timesheet per billed state edge case (#40010)

If value is 100.0000x then it won't set status correctly but will set it the next time it's loaded from db.

(cherry picked from commit 38e88db2c9)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-02-22 12:29:56 +05:30
mergify[bot]
865cba406f fix: negative stock error while making stock reconciliation (backport #40016) (#40025) 
* fix: negative stock error while making stock reconciliation (#40016)

fix: negative stock error while making stock reco
(cherry picked from commit da184d709b)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py

* chore: fix conflicts

* chore: fix linter issue

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-22 11:39:48 +05:30
mergify[bot]
079ba7670c fix: incorrect item name in MR (backport #40018) (#40023) 
fix: incorrect item name in MR (#40018)

(cherry picked from commit 864d7ae04c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-22 09:50:33 +05:30
rohitwaghchaure
97b665b043 Merge pull request #40000 from frappe/mergify/bp/version-14-hotfix/pr-39998 
fix: Completed Work Orders report not working (backport #39998)
 2024-02-21 17:44:32 +05:30
Rohit Waghchaure
c8e1409b80 fix: Completed Work Orders report not working 
(cherry picked from commit 11f4cb914a)
 2024-02-21 11:20:43 +00:00
Nabin Hait
13a663c6cb Merge pull request #39971 from nabinhait/asset-movement-deletion-issue 
fix: Delete linked asset movement record on cancellation of purchase receipt/invoice
 2024-02-21 11:14:31 +05:30
rohitwaghchaure
64099b0bf7 fix: webpages are not showing (#39988) 2024-02-21 09:26:58 +05:30
Nabin Hait
ea1a0b3a28 fix: linter issue 2024-02-21 08:43:10 +05:30
Nabin Hait
46cd929d00 fix: Delete orphaned asset movement item records 2024-02-20 18:36:23 +05:30
Nabin Hait
46762ead05 Merge pull request #39982 from nabinhait/asset-capitalization-cancel 
fix: On cancelation of capitalization, reverse depreciation entry only if journal entry exists
 2024-02-20 18:30:14 +05:30
Nabin Hait
5b9905f27a fix: On cancelation of capitalization, reverse depreciation entry only if journal entry exists 2024-02-20 17:54:58 +05:30
mergify[bot]
8e71665e4f fix: 'NoneType' object is not iterable (backport #39977) (#39980) 
fix: 'NoneType' object is not iterable (#39977)

(cherry picked from commit 8e7d47b3a7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-20 15:53:20 +05:30
mergify[bot]
385b08dc50 fix: show active bom in the dropdown while making stock entry and MR (backport #39974) (#39975) 
fix: show active bom in the dropdown while making stock entry and MR (#39974)

(cherry picked from commit 133f8bd92a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-20 13:13:35 +05:30
Nabin Hait
c53ced1224 Merge pull request #39874 from nabinhait/depreciation-last-row-adjustment 
fix: Adjust amount in last row due to rounding
 2024-02-20 13:13:02 +05:30
Nabin Hait
a4fbea3722 fix: linter issue 2024-02-20 12:31:34 +05:30
Nabin Hait
e99485bfa7 fix: linter issues 2024-02-20 12:24:36 +05:30
Nabin Hait
963ddac528 fix: Adjust amount in last row due to rounding 2024-02-20 12:24:36 +05:30
Nabin Hait
11bddc14bb fix: Delete linked asset movement record on cancellation of purchase receipt/invoice 2024-02-20 12:23:16 +05:30
Nabin Hait
947f138ea4 Merge pull request #39973 from nabinhait/linter-issue-1 
Linter issue
 2024-02-20 12:22:47 +05:30
Nabin Hait
abceb1b611 fix: linter issue 2024-02-20 12:21:12 +05:30
Nitali Mittal
d913ec52db feat: New financial views - Growth and margin views for P&L and balance sheet 
feat: New financial views - Growth and margin views for P&L and balance sheet
 2024-02-19 16:36:23 +05:30
ruthra kumar
e337a55a0b Merge pull request #39954 from frappe/mergify/bp/version-14-hotfix/pr-39914 
refactor: add total row if only one party is being filtered (backport #39914)
 2024-02-19 09:16:27 +05:30
ruthra kumar
310f338d9b Merge pull request #39952 from frappe/mergify/bp/version-14-hotfix/pr-39942 
fix: group node in warehouse filter in Item-wise Sales Register (backport #39942)
 2024-02-19 09:15:49 +05:30
ruthra kumar
b0c2d41ecb Merge pull request #39832 from ruthra-kumar/convert_latest_check_sql_to_qb 
fix: reconciliation issue due to notation difference
 2024-02-19 08:37:59 +05:30
ruthra kumar
241507a87f refactor: add total row if only one party is being filtered 
(cherry picked from commit b1dfa2537b)
 2024-02-19 02:56:40 +00:00
ruthra kumar
4921b038bd fix: group node in warehouse filter in Item-wise Sales Register 
(cherry picked from commit 44538bd02a)
 2024-02-19 02:56:18 +00:00
ruthra kumar
229e4f65b4 Merge pull request #39951 from ruthra-kumar/typerror_on_item_group_filter_in_purchase_register 
fix: typerror on 'Item Group' filter on Item-Wise Purchase Register
 2024-02-19 08:22:07 +05:30