Commit Graph

49206 Commits

Author SHA1 Message Date
ruthra kumar
5ec62756fb Merge pull request #41976 from ruthra-kumar/pricing_rule_priority_and_apply_multiple
fix: pricing rule with and without 'apply multiple' and priority
2024-06-23 05:31:20 +05:30
ruthra kumar
a4c0115b5e Merge pull request #41844 from ruthra-kumar/forex_accounts_support_for_advance_accounts
refactor: allow foreign currency advance accounts
2024-06-23 05:26:52 +05:30
Sagar Vora
ac6d85aed6 perf: dont run queries unnecessarily, improved filters (#41993)
* perf: dont run queries unnecessarily, improved filters

* perf: dont run query if `in` filter is empty
2024-06-22 21:27:00 +05:30
ruthra kumar
efebc3662e test: priority takes effect on with and without apply multiple 2024-06-22 20:30:55 +05:30
ruthra kumar
3fabf4aaa4 refactor(test): make and use a different party for subscription 2024-06-22 19:32:07 +05:30
rohitwaghchaure
fd7666a029 feat: default account head for operating cost (#41985) 2024-06-21 18:56:48 +05:30
ruthra kumar
4f92ab0ac7 Merge pull request #41981 from ruthra-kumar/repost_should_update_against_account
fix: incorrect against_account upon reposting
2024-06-21 17:58:14 +05:30
rohitwaghchaure
21adc7b63e fix: decimal issue in pick list (#41972) 2024-06-21 17:41:48 +05:30
ruthra kumar
20c4098399 fix: incorrect against_account upon reposting 2024-06-21 17:21:32 +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
5e875b238c fix: pricing rule with and without 'apply multiple' and priority
Either all of the pricing rules identified for an item should have
'apply multiple' enabled. If not, Priority is applied and only the
highest priority is applied
2024-06-21 15:46:16 +05:30
Raffael Meyer
86869ac8b8 Merge pull request #41966 from barredterra/per-for-shipment 2024-06-20 14:34:39 +02:00
barredterra
100d8e2007 fix: move condition for shipment 2024-06-20 14:33:03 +02:00
rohitwaghchaure
d5ed4582c3 fix: this.frm.events.update_cost is not a function (#41960) 2024-06-20 17:05:19 +05:30
mahsem
f28c692dca fix: add string for translation (#41903)
fix: add string for translation
2024-06-20 14:23:57 +05:30
rohitwaghchaure
306ab454d5 Merge pull request #41957 from rohitwaghchaure/fixed-17237
fix: expense account from item group not fetched
2024-06-20 14:22:22 +05:30
rohitwaghchaure
ef744c1f2c Merge pull request #41958 from rohitwaghchaure/fixed-17439
fix: do not show zero balance stock items in stock balance report
2024-06-20 14:19:13 +05:30
Rohit Waghchaure
7f7b363d48 fix: do not show zero balance stock in stock balance 2024-06-20 13:59:02 +05:30
Rohit Waghchaure
86ebe58231 fix: expense account from item group not fetched 2024-06-20 13:42:45 +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
ruthra kumar
64e63887be refactor(test): enfore use of customer/supplier master
While using advance accounts in foreign currency, always use
Customer/Supplier master to maintain them
2024-06-18 15:10:25 +05:30
ruthra kumar
c696d13a5e fix(test): incorrect field for customer default billing currency 2024-06-18 14:35:35 +05:30
ruthra kumar
8a397a4506 Merge pull request #41900 from ljain112/unreco
refactor: ignore unreconcile doc for PO and SO on cancel/delete
2024-06-18 10:26:58 +05:30
rohitwaghchaure
1cce7064e0 Merge pull request #41936 from casesolved-co-uk/prodplan_bomqty_test
feat: add production plan test for complex bom qtys
2024-06-18 09:42:35 +05:30
Richard Case
3025501500 chore: linting 2024-06-17 17:55:23 +01:00
Richard Case
a2ba0f51a0 feat: add production plan test for complex bom qtys 2024-06-17 17:49:31 +01:00
rohitwaghchaure
46d33d27cf Merge pull request #41931 from rohitwaghchaure/fixed-validation-for-reposting
fix: reposting validation related PCV
2024-06-17 17:49:35 +05:30
rohitwaghchaure
8141eacb02 Merge pull request #41907 from mahsem/fix-add-strings-for-translation-in-pos_item_cart.js
fix: add strings for translation in pos_item_cart.js
2024-06-17 17:09:42 +05:30
Rohit Waghchaure
194f1dc674 fix: reposting validation related PCV 2024-06-17 16:54:02 +05:30
rohitwaghchaure
28f195023e Merge pull request #41920 from ljain112/fix-sales-register
fix: handle NoneType error where customer details are not available in sales register
2024-06-17 14:58:07 +05:30
rohitwaghchaure
2e5b85c329 Merge pull request #41927 from ljain112/fix-item-pur-report
fix: consistent query field name in item wise purchase register with item wise sales register
2024-06-17 14:57:08 +05:30
ljain112
6d539e0fc0 fix: consistent query field name in item wise purchase register with item wise sales register 2024-06-17 14:30:31 +05:30
rohitwaghchaure
1b072228d3 Merge pull request #41921 from Nihantra-Patel/item-wise-sales_purchase_report_v15
fix: item_code filter in item-wise sales-purchase register
2024-06-17 14:01:06 +05:30
rohitwaghchaure
2c0f03d43a Merge pull request #41922 from rohitwaghchaure/fixed-17235
fix: duplicate rows fetching in RFQ
2024-06-17 13:05:18 +05:30
Rohit Waghchaure
555510c128 fix: duplicate rows fetching in RFQ 2024-06-17 12:48:44 +05:30
Nihantra Patel
757aef3972 fix: item_code filter in item-wise sales-purchase register 2024-06-17 12:33:14 +05:30
ljain112
f876fec6f5 fix: handle NoneType error where customer details are not available in sales register 2024-06-17 12:32:17 +05:30
rohitwaghchaure
3f13554bfb Merge pull request #41898 from Nihantra-Patel/upd_mr_received_qty_v15
fix: update received qty in MR on purchase invoice submit with update stock
2024-06-17 11:35:36 +05:30
rohitwaghchaure
4fc43b9009 Merge pull request #41916 from rohitwaghchaure/fixed-incorrect-batch-returned
fix: incorrect batch return from sales return
2024-06-17 11:16:31 +05:30
Rohit Waghchaure
317047c808 fix: incorrect batch return from sales return 2024-06-17 10:22:06 +05:30
ruthra kumar
7e318c0132 chore: remove dead code 2024-06-17 08:45:54 +05:30
ruthra kumar
07d59443b7 chore: fix test data 2024-06-17 07:39:52 +05:30
ruthra kumar
83ff94b9b8 refactor: better error messages 2024-06-17 07:29:24 +05:30
ruthra kumar
7479459cb6 Merge pull request #40187 from GursheenK/valuation-tax-gle-via-lcv
fix: valuation tax entries on LCV after billing PR
2024-06-15 20:41:22 +05:30
barredterra
895aede590 fix: only show user and date if available 2024-06-14 17:47:02 +02:00
mahsem
2fb3e5da4a fix: add strings for translation in pos_item_cart.js
fix: add strings for translation in pos_item_cart.js
2024-06-14 15:40:08 +02:00
Nihantra Patel
77959596db fix: add test case for update received qty in MR - import sorter 2024-06-14 16:50:49 +05:30
Nihantra Patel
73f22ba9a0 fix: add test case for update received qty in MR - import sorter 2024-06-14 16:50:04 +05:30
Nihantra Patel
62e4e88f1d fix: add test case for update received qty in MR 2024-06-14 16:47:30 +05:30