Khushi Rawat
ba79e68190
fix: refactor Asset Repair and Stock Entry linkage to resolve amendme… ( #41919 )
...
* fix: refactor Asset Repair and Stock Entry linkage to resolve amendment issues
* chore: added missing patch to patches.txt
* chore: fixing previous changes
* chore: fixing minor issues
* fix: code changes to enhance efficiency
* chore: replaced frappe.qb with db.sql because of conflict
* fix: minor changes
2024-06-27 17:34:25 +05:30
rohitwaghchaure
9738c04ef0
fix: not able to make purchase return ( #42053 )
2024-06-27 16:01:51 +05:30
Raffael Meyer
f850ccc4d8
Merge pull request #42054 from frappe/pot_develop_2024-06-27
2024-06-27 12:31:43 +02:00
frappe-pr-bot
7b5e041928
chore: update POT file
2024-06-27 10:15:22 +00:00
Raffael Meyer
42d401a1dd
Merge pull request #42048 from barredterra/ci-typo
2024-06-26 18:58:26 +02:00
barredterra
26aa1a128f
ci: fix typo in pot file regeneration
2024-06-26 17:54:51 +02:00
Khushi Rawat
80c6981cfa
fix: unhide serial no field ( #42045 )
2024-06-26 12:22:52 +00:00
Nihantra C. Patel
8ae2b8ff8c
fix: lead status filter ( #41816 )
2024-06-26 17:45:57 +05:30
Khushi Rawat
625f16dee0
fix: incorrect time period in asset depreciation schedule ( #41805 )
...
* fix(wip): depreciation calculation for existing asset
* fix(wip): added validation for incorrect depreciation period
* fix: depreciation schedule time period issue for existing asset
* chore: run pre-commit checks and apply fixes
* style: apply formatting changes
* style: made some necessary changes
* chore: modified test
2024-06-26 16:33:53 +05:30
Khushi Rawat
5fdd1d3278
chore: patch to enable total number of booked depreciations field ( #41940 )
...
* chore: patch to enable total number of booked depreciations field
* fix: conflict resolved
* refactor: replaced fb_row.db_set with set_value
2024-06-26 16:28:27 +05:30
rohitwaghchaure
eca3e02f8d
fix: manufacturing date issue in the batch ( #42034 )
2024-06-26 09:11:20 +05:30
Poorvi-R-Bhat
1a9899b32b
fix: Stock Reservation Entry was not getting created ( #42033 )
2024-06-25 18:42:07 +05:30
mergify[bot]
2e76b9f9db
fix: timeout while cancelling LCV (backport #42030 ) ( #42031 )
...
fix: timeout while cancelling LCV (#42030 )
fix: timeout while canelling LCV
(cherry picked from commit 21bf7fd1f8rohitw1991@gmail.com >
2024-06-25 18:11:41 +05:30
Raffael Meyer
61fe95a0bd
Merge pull request #41756 from fzozyurt/tr_account_plan-#41536
2024-06-25 12:56:09 +02:00
Khushi Rawat
1c643a0ead
fix: fixed asset value in Fixed Asset Register ( #41930 )
2024-06-25 16:05:04 +05:30
Khushi Rawat
5738d93f95
perf: code optimization to handle large asset creation ( #42018 )
2024-06-25 15:30:17 +05:30
rohitwaghchaure
97c9941143
fix: batch picking in pick list based on Stock Settings ( #42021 )
2024-06-25 14:28:31 +05:30
rohitwaghchaure
9ab333d105
fix: valuation rate for the legacy batches ( #42011 )
2024-06-25 12:32:27 +05:30
rohitwaghchaure
d50487ce53
fix: Wrong Delete Batch on Purchase Receipt ( #42007 )
2024-06-24 14:56:08 +05:30
rohitwaghchaure
7d91c6cbd5
fix: incorrect Difference Amount ( #42008 )
2024-06-24 14:55:57 +05:30
Deepesh Garg
379a290625
Merge pull request #41751 from rtdany10/gp-dimension
...
feat: accounting dimension filters in gp report
2024-06-24 10:51:55 +05:30
ruthra kumar
73d56c4b33
Merge pull request #41704 from blaggacao/payments/pr-2
...
chore: clarify codepath around mute email and make invoice
2024-06-23 05:39:00 +05:30
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
