schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,833 Commits 322 Branches 1,581 Tags
d424f0f8615ab0972151d7c8a2c9cf27a038f337
Commit Graph

47833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
d424f0f861 fix: Default year start and end date in reports 
(cherry picked from commit 2341061852)

# Conflicts:
#	erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
#	erpnext/accounts/report/profitability_analysis/profitability_analysis.js
#	erpnext/accounts/report/trial_balance/trial_balance.js
#	erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
#	erpnext/buying/report/procurement_tracker/procurement_tracker.js
#	erpnext/buying/report/purchase_analytics/purchase_analytics.js
#	erpnext/manufacturing/report/job_card_summary/job_card_summary.js
#	erpnext/manufacturing/report/production_analytics/production_analytics.js
#	erpnext/selling/report/sales_analytics/sales_analytics.js
#	erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js
#	erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
#	erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js
#	erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js
 2024-11-22 12:00:06 +00:00
Deepesh Garg
30073698f4 fix: Default year start and end dates in reports 
(cherry picked from commit 4496a6760e)

# Conflicts:
#	erpnext/accounts/doctype/account/account.js
#	erpnext/accounts/doctype/account/account_tree.js
#	erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
#	erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
#	erpnext/accounts/report/budget_variance_report/budget_variance_report.js
#	erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js
#	erpnext/accounts/report/gross_profit/gross_profit.js
#	erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
#	erpnext/accounts/report/profitability_analysis/profitability_analysis.js
#	erpnext/accounts/report/trial_balance/trial_balance.js
#	erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
#	erpnext/buying/report/procurement_tracker/procurement_tracker.js
#	erpnext/buying/report/purchase_analytics/purchase_analytics.js
#	erpnext/crm/report/campaign_efficiency/campaign_efficiency.js
#	erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.js
#	erpnext/manufacturing/report/job_card_summary/job_card_summary.js
#	erpnext/manufacturing/report/production_analytics/production_analytics.js
#	erpnext/public/js/purchase_trends_filters.js
#	erpnext/public/js/sales_trends_filters.js
#	erpnext/public/js/utils.js
#	erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
#	erpnext/selling/report/sales_analytics/sales_analytics.js
#	erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js
#	erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js
#	erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
#	erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js
#	erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.js
#	erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js
#	erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js
#	erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js
 2024-11-22 12:00:06 +00:00
ruthra kumar
8a45258778 Merge pull request #44286 from frappe/mergify/bp/version-14-hotfix/pr-44246 
fix: Get submitted documents in validate_for_closed_fiscal_year (backport #44246)
 2024-11-22 16:25:37 +05:30
rohitwaghchaure
d10a9d3225 Merge pull request #44288 from frappe/mergify/bp/version-14-hotfix/pr-44191 
fix: patch (backport #44191)
 2024-11-22 16:25:03 +05:30
rohitwaghchaure
3643c60c67 fix: patch (#44191) 
(cherry picked from commit 495528a758)
 2024-11-22 10:51:44 +00:00
ruthra kumar
92e252e37a Merge pull request #44284 from frappe/mergify/bp/version-14-hotfix/pr-44266 
fix: make free qty round on large transaction qty (backport #44266)
 2024-11-22 16:15:19 +05:30
vimalraj27
b9efeeb71a fix: Get submitted documents in validate_for_closed_fiscal_year 
(cherry picked from commit c607e5f940)
 2024-11-22 15:56:34 +05:30
venkat102
d695fb5723 test: add unit test to validate free qty round on large transaction qty 
(cherry picked from commit 013a6fc6ec)
 2024-11-22 10:20:54 +00:00
venkat102
2eb70026ae fix: make free qty round on large transaction qty 
(cherry picked from commit f9b8165385)
 2024-11-22 10:20:53 +00:00
ruthra kumar
18cbc956bb Merge pull request #44271 from frappe/mergify/bp/version-14-hotfix/pr-44194 
fix: include current invoice amount when tax_on_excess_amount is checked (backport #44194)
 2024-11-22 11:29:21 +05:30
venkat102
47e4fd3c76 test: add unit test for tax on excess amount 
(cherry picked from commit 4820273595)
 2024-11-22 05:37:26 +00:00
venkat102
071adcf291 fix: include current invoice amount when tax_on_excess_amount is checked 
(cherry picked from commit b74f2896cd)
 2024-11-22 05:37:26 +00:00
mergify[bot]
ee647f2381 fix: added Stock UOM field for RM in work order (backport #44185) (#44236) 
* fix: added Stock UOM field for RM in work order (#44185)

fix: added UOM field for RM in work order
(cherry picked from commit cc571aca8f)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order_item/work_order_item.json
#	erpnext/manufacturing/doctype/work_order_item/work_order_item.py
#	erpnext/patches.txt

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-21 14:52:18 +05:30
ruthra kumar
24126b03dd Merge pull request #44244 from frappe/mergify/bp/version-14-hotfix/pr-44197 
fix: payment reco for jv with negative dr or cr amount (backport #44197)
 2024-11-20 13:12:55 +05:30
ljain112
5fa4fd8825 fix: added test cases 
(cherry picked from commit 6f9ea6422d)
 2024-11-20 07:18:19 +00:00
ljain112
23fb4f348f fix: payment reco for jv with negative dr or cr amount 
(cherry picked from commit fee79b9445)
 2024-11-20 07:18:19 +00:00
ruthra kumar
227c912ece Merge pull request #44241 from frappe/mergify/bp/version-14-hotfix/pr-44240 
fix: non group pos warehouse (backport #44240)
 2024-11-20 12:17:33 +05:30
ruthra kumar
5bfbdb805c Merge pull request #44238 from frappe/mergify/bp/version-14-hotfix/pr-44220 
refactor: Update `Payment Request` search query in PE's reference (backport #44220)
 2024-11-20 12:16:21 +05:30
Nihantra C. Patel
ec40131d4d fix: non group pos warehouse 
(cherry picked from commit d526be0394)
 2024-11-20 06:41:34 +00:00
ruthra kumar
859672c419 Merge pull request #44232 from frappe/mergify/bp/version-14-hotfix/pr-44207 
fix: validate sales team to ensure all sales person are enabled (backport #44207)
 2024-11-20 11:51:56 +05:30
Abdeali Chharchhoda
e8c3617628 refactor: Update Payment Request search query in PE's reference 
(cherry picked from commit 4ab3499a17)
 2024-11-20 06:21:41 +00:00
ruthra kumar
09b21b8cb4 Merge pull request #44234 from frappe/mergify/bp/version-14-hotfix/pr-44203 
fix: disable conversion to user tz for sales order calender (backport #44203)
 2024-11-20 11:51:21 +05:30
ljain112
356da69179 fix: disable conversion to user tz for sales order calender 
(cherry picked from commit cdf098c193)
 2024-11-20 05:17:52 +00:00
ljain112
bd0f11ef4f fix: validate sales team to ensure all sales person are enabled 
(cherry picked from commit 548dbb33eb)
 2024-11-20 05:11:35 +00:00
ruthra kumar
9f3dfb3d18 Merge pull request #44216 from frappe/mergify/bp/version-14-hotfix/pr-44104 
fix: check if pricing rule matches with coupon code (backport #44104)
 2024-11-19 17:37:33 +05:30
Nikolas Beckel
24b5b3c8e0 fix: check if pricing rule matches with coupon code (#44104) 
* fix: check if pricing rule matches with coupon code

* fix: correct linting error

(cherry picked from commit 9d31bf7647)
 2024-11-19 11:41:48 +00:00
mergify[bot]
a7de8c1143 feat: new DocTypes "Code List" and "Common Code" (backport #43425) (#44172) 
Co-authored-by: David <dgx.arnold@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2024-11-18 20:59:41 +01:00
ruthra kumar
2fcab327aa Merge pull request #44181 from frappe/mergify/bp/version-14-hotfix/pr-44127 
fix: set default Party Type based on Payment Type in Payment Entry (backport #44127)
 2024-11-18 10:49:10 +05:30
vishakhdesai
f3cbbef346 fix: set default party type in Payment Entry 
(cherry picked from commit 19222690d3)
 2024-11-18 10:16:59 +05:30
ruthra kumar
339beff023 Merge pull request #44179 from frappe/mergify/bp/version-14-hotfix/pr-44147 
fix: set conversion factor before applying price list (backport #44147)
 2024-11-18 10:14:34 +05:30
ruthra kumar
85d398efcc Merge pull request #44177 from frappe/mergify/bp/version-14-hotfix/pr-44157 
fix: apply "cannot_add_rows" directly to table field for more efficient solution (backport #44157)
 2024-11-18 10:14:12 +05:30
vishakhdesai
e09f101336 fix: set conversion factor before applying price list 
(cherry picked from commit 9749fe23cc)
 2024-11-18 04:38:32 +00:00
UmakanthKaspa
f9b52b292e refactor: set 'cannot_add_rows' directly in the allocations table field (optimized approach) 
(cherry picked from commit 5dd8eafdfc)
 2024-11-18 04:36:12 +00:00
Türker Tunalı
8a94d7bea8 fix:Unable to pause job card (#42839) 
fix: unable to pause job card

Pause operation creates "Value missing for: Completed Qty" error. That field was mandatory but it's non mandatory in v15.
 2024-11-15 17:29:58 +05:30
mergify[bot]
f871f08f47 fix: stock ledger variance report filter options (backport #44137) (#44149) 
fix: stock ledger variance report filter options (#44137)

(cherry picked from commit e8bbf6492f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-15 15:05:03 +05:30
ruthra kumar
313ea3983f Merge pull request #44161 from frappe/mergify/bp/version-14-hotfix/pr-43414 
fix: Get Entries not showing accounts with no gain or loss in Exchange Rate Revaluation issue fixed (backport #43414)
 2024-11-15 13:09:35 +05:30
Vishakh Desai
c3e2ff2fa5 fix: linters 
(cherry picked from commit 9cc22b4cac)
 2024-11-15 07:18:49 +00:00
Vishakh Desai
33e835c4d3 fix: Get Entries not showing accounts with no gain or loss in Exchange Rate Revaluation issue 
(cherry picked from commit 6de6f55b39)
 2024-11-15 07:18:49 +00:00
ruthra kumar
c9fa4af4fe Merge pull request #44159 from frappe/mergify/bp/version-14-hotfix/pr-44158 
fix: broken UI on currency exchange (backport #44158)
 2024-11-15 12:28:18 +05:30
ruthra kumar
36898f6797 fix: broken UI on currency exchange 
(cherry picked from commit e91b65e7bd)
 2024-11-15 06:52:40 +00:00
ruthra kumar
b9a0f4fed8 Merge pull request #44154 from frappe/mergify/bp/version-14-hotfix/pr-44089 
fix: apply posting date sorting to invoices in Payment Reconciliation similar to payments (backport #44089)
 2024-11-15 10:54:40 +05:30
UmakanthKaspa
1019d98c5a fix: remove trailing whitespace 
(cherry picked from commit d6703eb88b)
 2024-11-15 05:00:03 +00:00
UmakanthKaspa
cc9b22ce9f fix: apply posting date sorting to invoices in Payment Reconciliation similar to payments 
(cherry picked from commit 0bd83d920d)
 2024-11-15 05:00:02 +00:00
ruthra kumar
f5135cd4a4 Merge pull request #44152 from frappe/mergify/bp/version-14-hotfix/pr-44148 
Fix: Disable "Add Row" button in allocations table during UnReconcile process (backport #44148)
 2024-11-15 10:22:43 +05:30
UmakanthKaspa
137ef78d96 fix: correctly set 'cannot_add_rows' property on allocations table field 
(cherry picked from commit 13ca2700f8)
 2024-11-15 04:47:46 +00:00
ruthra kumar
5452f8ac4a Merge pull request #44139 from frappe/mergify/bp/version-14-hotfix/pr-43189 
fix: broken apply on other item (backport #43189)
 2024-11-14 13:45:41 +05:30
ruthra kumar
f03e301250 fix: broken apply on other item pricing rule 
(cherry picked from commit e5119a749c)
 2024-11-14 07:54:10 +00:00
Raffael Meyer
c23868a14d fix: backport german translations from develop (#44046) 2024-11-13 18:17:50 +01:00
ruthra kumar
ddac2c59ab Merge pull request #44114 from frappe/mergify/bp/version-14-hotfix/pr-43977 
fix: update per_billed value in Purchase Receipt while creating Debit Note (backport #43977)
 2024-11-13 19:01:04 +05:30
rohitwaghchaure
030df0d7e8 chore: fix conflicts 2024-11-13 18:27:41 +05:30