Commit Graph

2882 Commits

Author SHA1 Message Date
rohitwaghchaure
1bf60248d9 perf: timeout error (#43154) 2024-09-10 18:41:46 +05:30
ruthra kumar
6c3a8400af Merge pull request #43051 from pra17shant/fix-unreconcile-redirect
fix: unreconcile allocation child table redirect url voucher no issue
2024-09-09 14:28:49 +05:30
ruthra kumar
3b8f0df239 Merge pull request #43064 from aerele/pricing_rule
fix: validate the item code when updating the other item's price rule
2024-09-09 14:13:00 +05:30
rohitwaghchaure
5a1a37e915 Merge pull request #43071 from rohitwaghchaure/fixed-support-21512
fix: Cannot read properties of null (reading 'doc')
2024-09-09 09:00:13 +05:30
Rushabh Mehta
87662403d9 Merge pull request #43090 from rmehta/logo-2024
fix(logo): updated logo
2024-09-06 14:35:50 +05:30
Rushabh Mehta
8a71b54572 fix(logo): updated logo 2024-09-06 14:14:15 +05:30
David Arnold
2ae1704d11 Merge pull request #41871 from blaggacao/perf/reduce-critical-path
perf: hot path in page load
2024-09-05 15:50:23 +02:00
Rohit Waghchaure
62c3389bd6 fix: Cannot read properties of null (reading 'doc') 2024-09-05 16:20:56 +05:30
Bhavan23
e2f3e8713e Merge branch 'develop' of github.com:aerele/erpnext into pricing_rule 2024-09-05 10:44:28 +05:30
Prashant Kamble
5d6f6a2fb9 fix: unreconcile allocation child table redirect url voucher no issue 2024-09-04 11:21:05 +00:00
ruthra kumar
fb6b960806 Merge pull request #42974 from Vishnu7025/report_fix
fix: retain date filter when redirecting in Profit and Loss report
2024-09-03 15:43:01 +05:30
rohitwaghchaure
f3b91d4d62 fix: validate component quantity according to BOM (#43011) 2024-09-02 16:05:43 +05:30
barredterra
ab2d7f7279 fix: show naming series only when needed 2024-08-31 19:14:45 +02:00
Bhavan23
45de18069c fix: validate the item code when updating the other item's price rule 2024-08-31 17:32:19 +05:30
vishnu
598e9c1390 fix: indentation 2024-08-28 15:12:22 +00:00
vishnu
bb29fc4c3d fix: retain date filter when redirecting in Profit and Loss report 2024-08-28 15:10:08 +00:00
rohitwaghchaure
86d3a9ab03 fix: Cannot read properties of null (reading 'doctype') (#42941) 2024-08-27 16:21:36 +05:30
Rushabh Mehta
0aae621d0e Merge pull request #42524 from blaggacao/fix/financial-statement-linking
fix: link cash flow rows and fix summary linking
2024-08-26 15:54:32 +05:30
barredterra
fd51dd8999 fix: remove ugly column break in setup wizard 2024-08-22 17:16:33 +02:00
ruthra kumar
5c5e2c3ac2 Merge pull request #42731 from creative-paramu/bank_reconcilation_filter
fix: bank reconcilation tool cost center company filter adding
2024-08-20 10:13:19 +05:30
Parameshwari Palanisamy
6d19aae423 refactor: update dialog_manager.js 2024-08-20 10:09:25 +05:30
Shariq Ansari
18b4b09371 Merge pull request #42727 from shariquerik/include-erpnext
fix: include erpnext in apps page
2024-08-12 19:41:55 +05:30
Shariq Ansari
1d52ef7afe fix: include erpnext in apps page 2024-08-12 17:48:54 +05:30
rohitwaghchaure
17ba0cff44 fix: currency changing while making PR from the PO (#42718) 2024-08-12 15:03:53 +05:30
ruthra kumar
91ce9fce9b fix: Maintain same rate on qty change on Quotation to Sales Order 2024-08-08 11:58:58 +05:30
rohitwaghchaure
c8af544ef3 fix: do not update item price and last purchase rate for inter transf… (#42616)
fix: do not update item price and last purchase rate for inter transfer transaction
2024-08-05 20:20:36 +05:30
David
41e395a7e3 fix: hot path in page load 2024-08-01 23:23:48 +02:00
Nabin Hait
281198456d fix: Discount and taxes in return document should follow the reference document (#41911)
* fix: Discount and taxes in return document should follow the reference document

* fix: Ignore Pricing rule on debit/credit note if created against PI/SI with test cases

* fix: linter issue
2024-08-01 14:51:01 +05:30
Nabin Hait
4986f28a89 fix: set currency on change of company considering customer default currency (#42405) 2024-07-31 11:44:05 +05:30
rohitwaghchaure
23fed831a0 fix: price_list_currency not found error (#42534) 2024-07-30 14:26:29 +05:30
David
b94af28587 fix: link cash flow rows and fix summary linking 2024-07-29 20:02:52 +02:00
rohitwaghchaure
0e817f42ef fix: dynamic condition in the pricing rule not working (#42467) 2024-07-25 10:15:05 +05:30
rohitwaghchaure
1186ee128c fix: actual qty in sales order (#42248) 2024-07-09 15:09:17 +05:30
ruthra kumar
c4ae0d283f fix: multiple free items on same Item Group 2024-07-03 15:58:19 +05:30
creative-paramu
6e2ac09821 fix: bank reconcilation tool cost center company filter adding 2024-06-30 20:37:09 +05:30
rohitwaghchaure
d50487ce53 fix: Wrong Delete Batch on Purchase Receipt (#42007) 2024-06-24 14:56:08 +05:30
ruthra kumar
5f8f81c0ba Merge pull request #41956 from ruthra-kumar/discount_on_other_item
fix: incorrect discount on other item
2024-06-21 15:51:17 +05:30
ruthra kumar
654764e398 fix: incorrect discount on other item
When discount is applied on other item, don't update `discount_amount`
as the amount is calculated for current item
2024-06-20 12:04:00 +05:30
Raffael Meyer
a9910817f5 Merge pull request #41421 from frappe/migrate_lead_notes 2024-06-19 00:56:04 +02:00
Rohit Waghchaure
555510c128 fix: duplicate rows fetching in RFQ 2024-06-17 12:48:44 +05:30
barredterra
895aede590 fix: only show user and date if available 2024-06-14 17:47:02 +02:00
ruthra kumar
fec9d45ab3 Merge pull request #41793 from Nihantra-Patel/update_totals_taxes_15
fix: calculate totals and taxes
2024-06-10 15:17:28 +05:30
Deepesh Garg
49e180a9b9 Merge pull request #41727 from deepeshgarg007/price_rule_change
fix: Do no apply pricing rule on qty change for mapped docs
2024-06-06 09:13:24 +05:30
Nihantra C. Patel
a7ec0c1cec fix: calculate totals and taxes 2024-06-05 15:49:44 +05:30
rohitwaghchaure
cb6d8afa26 fix: incorrect batch selection while sales return (#41768) 2024-06-04 14:34:10 +05:30
rohitwaghchaure
cf508ce1ed fix: TypeError: 'float' object is not iterable (#41758) 2024-06-04 11:58:32 +05:30
Deepesh Garg
2b1242170c fix: Do no apply pricing rule on qty change for mapped docs 2024-06-03 10:09:20 +05:30
rohitwaghchaure
9e9296e444 feat: track Semi-finished goods (including subcontracted items) against Job Cards (#38341)
* feat: Track Semi-finished goods (including subcontracted items) against Job Cards

* feat: option to add raw materials manually against operation
2024-06-02 01:28:58 +05:30
rohitwaghchaure
968120d0eb fix: batch selection issue (#41692) 2024-05-30 18:06:29 +05:30
rohitwaghchaure
ad817cddad perf: sales order UI render (#41591) 2024-05-22 19:57:52 +05:30