CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-11 22:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,596 Commits 411 Branches 1,717 Tags
9630dc7b882f668999453f2854bfae67f779ced9
Commit Graph

46596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ruthra kumar
a4f94ed631 Merge pull request #39949 from frappe/mergify/bp/version-14-hotfix/pr-39943 
refactor: use popup to inform on additional reconciliation step for Cr/Dr Notes (backport #39943)
 2024-02-19 08:21:39 +05:30
ruthra kumar
b1a4249041 fix: typeerror 'Item Group' filter on Purchase Register 2024-02-19 07:44:02 +05:30
ruthra kumar
5894bb3bbe refactor: use popup to inform on additional reconciliation step 
(cherry picked from commit 0d260faa00)
 2024-02-19 07:32:19 +05:30
Raffael Meyer
a83ce43845 Merge pull request #39906 from frappe/mergify/bp/version-14-hotfix/pr-39857 
fix: fetch company terms (backport #39857)
 2024-02-17 01:26:33 +01:00
Raffael Meyer
744de8595d Merge pull request #39927 from barredterra/bt-precision-v14 2024-02-17 00:32:15 +01:00
Raffael Meyer
e827507698 Merge pull request #39939 from frappe/mergify/bp/version-14-hotfix/pr-39938 
fix(Issue): create communication (backport #39938)
 2024-02-16 20:47:25 +01:00
barredterra
8deaba8def fix(Issue): create communication 
Ignore permisions and mandatory. Required, for example, when Issue is created by Customer via portal.

(cherry picked from commit 3f1d008741)
 2024-02-16 19:15:29 +00:00
barredterra
cea0e1fb91 fix(Bank Transaction): precision for (un)allocated_amount 
Manual Backport of #39926
 2024-02-15 19:58:16 +01:00
rohitwaghchaure
51dc3f57e1 Merge pull request #39917 from frappe/mergify/bp/version-14-hotfix/pr-39905 
fix: party item code in Blanket Order (backport #39905)
 2024-02-15 17:56:34 +05:30
rohitwaghchaure
ca8fb17ee8 chore: fix conflicts 2024-02-15 17:32:34 +05:30
rohitwaghchaure
1cca51afc6 chore: fix linter issue 
(cherry picked from commit 230a7d8d53)
 2024-02-15 09:33:41 +00:00
Rohit Waghchaure
ee9a51f93f fix: party item code in Blanket Order 
(cherry picked from commit 1a8f7f9403)

# Conflicts:
#	erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.py
 2024-02-15 09:33:40 +00:00
kunhi
5eaa11b9e8 fix: update_dimension is required and not need party account method 
(cherry picked from commit e6949d71f6)
 2024-02-14 14:54:44 +00:00
kunhi
45a0494318 fix: no need call for company method in sales invoice js 
(cherry picked from commit e3bd8d10b0)
 2024-02-14 14:54:44 +00:00
kunhi
83bf28616e fix: fetch company terms 
(cherry picked from commit d97b6d38ef)
 2024-02-14 14:54:43 +00:00
mergify[bot]
ab7e323648 fix: production plan issue with sales order (backport #39901) (#39903) 
fix:  production plan issue with sales order (#39901)

(cherry picked from commit d0df5df4a6)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-14 17:28:50 +05:30
mergify[bot]
d0b9c568d3 fix: landed cost voucher not submitting because of incorrect reference (backport #39898) (#39899) 
fix: landed cost voucher not submitting because of incorrect reference (#39898)

(cherry picked from commit 6239fd704b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-14 15:57:48 +05:30
Raffael Meyer
6b53288975 Merge pull request #39893 from frappe/mergify/bp/version-14-hotfix/pr-39868 
fix(Purchase Receipt): calculate `stock_value_diff` (backport #39868)
 2024-02-14 01:22:09 +01:00