47087 Commits

Author SHA1 Message Date
ruthra kumar
03013a8433
Merge pull request #38461 from frappe/mergify/bp/version-15-hotfix/pr-38457
refactor: use flt on outstanding on AR/AP summary report (backport #38457)
2023-11-30 16:42:58 +05:30
ruthra kumar
f44bb0df50 refactor: use flt on outstanding on AR/AP summary report
(cherry picked from commit e4bdd3a28d7fa29b0460ad6661ff39a219c1fc5c)
2023-11-30 10:55:51 +00:00
mergify[bot]
5e6a4d257e
feat: enable automatic type annotations (backport #38452) (#38454)
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f6618f52c7e6194f7abd345cf920b15)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-11-30 14:43:16 +05:30
mergify[bot]
7f4d2b707a
refactor: Simpler log settings setup (backport #38449) (#38451)
refactor: Simpler log settings setup (#38449)

Depends on https://github.com/frappe/frappe/pull/23507

(cherry picked from commit 1da9087cc4e0a411a820b817d0a1c657981be84e)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-11-30 13:30:15 +05:30
ruthra kumar
05da5bfc9a
Merge pull request #38448 from frappe/mergify/bp/version-15-hotfix/pr-38446
refactor: pass on filter to up front outstanding query as well (backport #38446)
2023-11-30 13:18:52 +05:30
ruthra kumar
7a1744691f refactor: pass on filter to upfront outstanding query as well
(cherry picked from commit cfd3230c75b5e549b98b2362947ee8744c98e920)
2023-11-30 07:26:32 +00:00
mergify[bot]
e06669847d
fix: exploded items in Subcontracting Receipt (backport #38441) (#38445)
fix: exploded items in Subcontracting Receipt

(cherry picked from commit 62b4a263f86a15dc39cd62b4fa39df87f0ec0dfa)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-30 12:16:07 +05:30
mergify[bot]
a50e872820
fix: use docstatus instead of status (backport #38439) (#38443)
fix: use `docstatus` instead of `status`

(cherry picked from commit 1423b38d50faa8b2f44cab9626a837037e1d0570)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-30 12:12:02 +05:30
mergify[bot]
7005d51af3
feat: auto create PR on SCR submission (backport #38290) (#38428)
* feat: add field `Action on Purchase Order Submission`

(cherry picked from commit 628ea42b63217fcf64c9803fdfdad09c610b00c3)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* feat: auto create SCO on PO submission

(cherry picked from commit 9ec6f1e1d63ccb8087cb3f95c6a100b02d22ba79)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* feat: add field `Action on Subcontracting Receipt Submission`

(cherry picked from commit 762906f24023af3f0fdba70c5dbf61951f45dd68)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* chore: notify user on SCO creation

(cherry picked from commit 745e3bfb733bdbce034b9b1fb3cd83a502a423a7)

* feat: add field `Purchase Order Item` in SCO Service Item

(cherry picked from commit 45d5cff47d7fc53fcf710afac281907ba9ab9e00)

* fix: hold PO item ref in SCO Service Item

(cherry picked from commit 7e4dd33ab0da2800fdb4aeb89ef9d183bff19d4d)

* feat: add field `Purchase Order Item` in SCO Item

(cherry picked from commit a2ede7d6d5241665d996447a1c9e2d1447190066)

* fix: maintain PO and PO Item ref in SCR Item

(cherry picked from commit e1cea2578151ee0f43e1809a7f99d2e90bf774a6)

* feat: auto create PR on SCR submission

(cherry picked from commit 040cc8d22f700a1823425d1534b91d50289d2489)

* feat: add `Purchase Order` link in SCR connections

(cherry picked from commit ca8a5b45ba58b62cd661dae508af9b0e26ff7973)

* feat: add `Subcontracting Receipt` link in PO connections

(cherry picked from commit 98cba5ed30ed2c8f5191d7cfaac54b16997cf09e)

* fix: dont show `View` button on cancelled SCR

(cherry picked from commit dd80d3b9b94c970d5070e1a5fac03cf9f1fbc455)

* fix: use checkbox instead of select field

(cherry picked from commit d366a91d9eae52175cd7f10f8a77b96dc09bfd00)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* feat: Subcontracting Receipt ref in Purchase Receipt

(cherry picked from commit d891bd7fac1ab9e46a94959dedcc45e18ac69de5)

* feat: SCR Item ref in PR Item

(cherry picked from commit 37b3ac795284c0ee9593753ececcfe4871e538a4)

* feat: provision to create PR from SCR

(cherry picked from commit 8052103197112d2e1abe7ac35a831267ad9549b7)

* chore: PR ref in SCR connections

(cherry picked from commit 096a2c8cd0afafb28e916a5c9e92ef1eb041e0a3)

* fix: map warehouses in return SCR

(cherry picked from commit 874766a82f1b31a55b8d5c9c998896748ad49cdf)

* fix(ux): hide `Create Purchase Receipt` button for Subcontract Return

(cherry picked from commit 7145b040f12a62be9f0ac945c69ac221debd7c03)

* chore: `linter`

(cherry picked from commit 857f2b5a014b4d14d21bca793ea569f8bdc1c398)

* test: auto create SCO on PO submit

(cherry picked from commit 68585f6f2b05e0b8dc3429741950ef31bbc42e17)

* test: auto create PR on SCR submit

(cherry picked from commit 7b0cd03f88a7052460438ee70390799fae5c336c)

* fix(test): `test_auto_create_purchase_receipt`

(cherry picked from commit 3da0aa6a0b21c775e5356ae7d359f7378f190d92)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-30 12:11:05 +05:30
Deepesh Garg
277e81c68e
Merge pull request #38431 from frappe/mergify/bp/version-15-hotfix/pr-38429
fix(minor): set capital WIP account before asset tests (#38429)
2023-11-30 08:15:11 +05:30
Gursheen Anand
de7e1ab237 fix: set cwip account before asset tests
(cherry picked from commit ef8e4191cda22e148e9319758ab6624d76a4ae2f)
2023-11-29 13:24:56 +00:00
Deepesh Garg
f1456d072c
Merge pull request #38423 from frappe/mergify/bp/version-15-hotfix/pr-38250
fix: unset discount amount based on coupon code (#38250)
2023-11-29 18:21:30 +05:30
Gursheen Anand
0e50e77d8e fix: unset discount amount based on coupon code
(cherry picked from commit 6518582ed3be49dd3bc6a62745dae3e6faed2658)
2023-11-29 10:25:19 +00:00
rohitwaghchaure
d0f1dec573
Merge pull request #38411 from frappe/mergify/bp/version-15-hotfix/pr-38165
fix: make create button translatable (backport #38165)
2023-11-29 13:05:03 +05:30
rohitwaghchaure
4bb1cb50ba
Merge pull request #38419 from frappe/mergify/bp/version-15-hotfix/pr-38415
fix: incorrect ordered qty for Subcontracting Order (backport #38415)
2023-11-29 13:02:53 +05:30
rohitwaghchaure
71fe2bcc28 fix: incorrect ordered qty for Subcontracting Order (#38415)
(cherry picked from commit fddf341f444efa89f80ec0fcb4e35b9b840061f5)
2023-11-29 06:52:36 +00:00
mergify[bot]
12ad1ec71a
feat: shift depreciation for assets (backport #38327) (#38417)
feat: shift depreciation for assets (#38327)

* feat: shift depreciation for assets

* chore: create new asset depr schedule on shift change

* refactor: move create_depr_schedule to after_insert

* fix: args in get_depreciation_amount test

* refactor: rename shift adjustment to shift allocation

* chore: asset shift factor doctype and auto allocate shift diff

* chore: use check instead of depr type, and add tests

* chore: make linter happy

* chore: give permissions to accounts users

(cherry picked from commit fe5fc5bd3abfff57f85f62eac18f3ffc242baa4b)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-11-29 12:15:53 +05:30
mergify[bot]
80afeca229
fix: OperationalError while selecting Serial No in Warranty Claim (backport #38394) (#38414)
* refactor: use arrow function

(cherry picked from commit 1763824e5f7ccaefb83aea84db47c92f9e4c9417)

* refactor: use DocType `Fetch From` instead of `frm.add_fetch`

(cherry picked from commit 01044ca8e95ec4e84e63fcfe4928ca111cf3a75b)

* refactor: use `frm.set_query` to add filters

(cherry picked from commit 640dfab827f2e83b9c3ae7ff839c6f94b63b71b2)

* refactor: don't use `cur_frm`

(cherry picked from commit 9fadf5f42678736567160bb2b06619383146d4ca)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-29 10:40:41 +05:30
Patrick Eissler
95f9cc99b9 fix: make create button translatable (#38165)
* fix: make all create buttons translatable

* style: use double quotes

---------

Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 8e4b591ea2ad420a7c861a06414d3bee6e6ee042)
2023-11-29 04:54:25 +00:00
mergify[bot]
4a243ce5b7
fix(regional): use net figures for sales calc (#38260)
fix(regional): use net figures for sales calc (#38260)

(cherry picked from commit 663bb8726c25005ab83a6ca4c82814b82a98a1e2)

Co-authored-by: Dany Robert <danyrt@wahni.com>
2023-11-29 09:08:50 +05:30
mergify[bot]
b9f26ae849
fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342)
fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342)

* fix: Debit credit mimatch in multicurrecy asset purchase receipt

* test: multi currency purchase receipt

* chore: update init files

* test: roolback

(cherry picked from commit add238c892364ce25f3e7483cb5fd295f9666a56)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-11-29 09:06:34 +05:30
mergify[bot]
c1018555a0
fix: no fstring in translation (backport #38381) (#38387)
fix: no fstring in translation (#38381)

(cherry picked from commit 8f00481c5f7742b120a232622fae7b3f7e3d2e86)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-11-28 21:36:05 +05:30
Shariq Ansari
9f873749e2
Merge pull request #38400 from frappe/mergify/bp/version-15-hotfix/pr-38398
fix(CRM): create contact if existing customer doesn't have contact (backport #38398)
2023-11-28 20:45:34 +05:30
Shariq Ansari
b1b065daf1 fix: create contact if existing customer doesn't have contact
(cherry picked from commit 23b0b8ba36595f8d1a62e44f51967a4d9a56641f)
2023-11-28 14:20:10 +00:00
Gursheen Kaur Anand
33b3355cb3
Merge pull request #38396 from frappe/mergify/bp/version-15-hotfix/pr-38392
fix: imports for renamed report (backport #38392)
2023-11-28 19:21:37 +05:30
mergify[bot]
b65c22579d
fix: serial no status (backport #38391) (#38397)
fix: serial no status (#38391)

(cherry picked from commit 592fc81260779ec42b35c88c6b8de19a598911d0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-28 18:31:23 +05:30
Gursheen Anand
573c4d2bfc chore: fix imports for renamed report
(cherry picked from commit aee2e12f3944ae4db2dd77a31d0c544c1bacb65a)
2023-11-28 12:53:53 +00:00
mergify[bot]
922aef665b
fix: Server Error while creating Product Bundle (backport #38377) (#38380)
* fix: product bundle search input

(cherry picked from commit 729fc738af7d78a6f75cb0f794f4c4451d74cd05)

* fix: don't select all fields

(cherry picked from commit 8c3713b649c7777e35be74b7afe437cec682359e)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-28 14:54:05 +05:30
mergify[bot]
a6f3a103db
chore: fix flaky test case (backport #38369) (#38373)
chore: fix flaky test case (#38369)

(cherry picked from commit ad3634be7c2607ab5c9c831ae01e5ddff7c9ba8b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-28 08:36:06 +05:30
Sagar Vora
8c906b422f
Merge pull request #38366 from frappe/mergify/bp/version-15-hotfix/pr-38360
fix: make parameters of `create_subscription_process` optional (and other minor fixes) (backport #38360)
2023-11-27 21:06:36 +05:30
Sagar Vora
721b429d93 fix: make parameters of create_subscription_process optional (and other minor fixes) (#38360)
(cherry picked from commit 5a53a4b044be7e889080329056c7911970d92da8)
2023-11-27 14:53:39 +00:00
ruthra kumar
7385db0cce
Merge pull request #38359 from frappe/mergify/bp/version-15-hotfix/pr-38354
refactor: handle rounding loss on AR/AP reports (backport #38354)
2023-11-27 12:16:13 +05:30
ruthra kumar
8564d58afe refactor: handle rounding loss on AR/AP reports
(cherry picked from commit 592ce45da7659dcf4ca148f5924dbe0d783956bf)
2023-11-27 06:22:52 +00:00
mergify[bot]
4699887f1c
fix: Payment Reco Issue and chart of account importer
fix: Payment Reco Issue and chart of account importer
2023-11-27 10:31:12 +05:30
mergify[bot]
14174df862
fix: Negative Qty and Rates in SO/PO (backport #38252) (#38357)
fix: Negative Qty and Rates in SO/PO (#38252)

* fix: Don't allow negative qty in SO/PO

* fix: Type casting for safe comparisons

* fix: Grammar in error message

* fix: Negative rates should be allowed via Update Items in SO/PO

* fix: Use `non_negative` property in docfield & emove code validation

(cherry picked from commit b9f5a1c85dc29acc22e704d866178a98f3035c1d)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2023-11-27 09:30:16 +05:30
ruthra kumar
5d993d4bc7
Merge pull request #38356 from frappe/mergify/bp/version-15-hotfix/pr-38081
fix: check reposting ledger settings before setting repost flag (backport #38081)
2023-11-27 09:29:22 +05:30
ruthra kumar
378dc50aa4 chore: resolve conflict 2023-11-27 09:09:04 +05:30
Gursheen Anand
25bf475d5a fix: check reposting settings before allowing editable si
(cherry picked from commit 894ae1fe0f8da1931f705d433c15b19410486186)
2023-11-27 03:35:39 +00:00
Gursheen Anand
ac7615ac01 fix: allow on submit for child table fields
(cherry picked from commit 5fae2f6d57bac332263d8c73e3d090f485b5844d)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
2023-11-27 03:35:39 +00:00
Gursheen Anand
6a3c3b4cac fix: do not set repost flag without validating voucher
(cherry picked from commit ad5edbb1de95befa1b6f312dcb7df6d8c5a8ce6c)
2023-11-27 03:35:38 +00:00
Gursheen Anand
85bd649c64 refactor: validate reposting settings for editables inv
(cherry picked from commit 780b827adcba571b46ee73404f9a038c36dd0eb9)
2023-11-27 03:35:38 +00:00
mergify[bot]
3cbe59902a
fix(ux): Sales Order Stock Reservation Dialog (backport #38261) (#38344)
* fix(ux): no need to select rows to reserve the stock

(cherry picked from commit 9c889b37fb3e6572043c7a28706e43d051e2ff46)

* fix: use field `sales_order_item` instead `name`

(cherry picked from commit 73586fd9b2f9392d18f65a063b14ef2de2629615)

* fix(ux): no need to select rows to unreserve the stock

(cherry picked from commit 2a41da94d443dee51e615b395d18ad161d4e87fc)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-26 22:25:51 +05:30
mergify[bot]
cda5ff40f1
refactor: bank transaction (#38182)
refactor: bank transaction (#38182)

(cherry picked from commit 5426b93387c8a4599b11d5e064d4d8b37078aca1)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-11-26 18:57:01 +05:30
mergify[bot]
d6fe7eb10c
fix: job card overlap validation (backport #38345) (#38348)
fix: job card overlap validation (#38345)

(cherry picked from commit d8245cef723575eaf52c2e39d25a6f9c83ce9ba0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-26 16:28:51 +05:30
Deepesh Garg
e0f9c64290
Merge pull request #38332 from frappe/mergify/bp/version-15-hotfix/pr-38309
feat: new Report "Lost Quotations" (#38309)
2023-11-25 17:36:50 +05:30
Raffael Meyer
ea2c3487a3 feat: new Report "Lost Quotations" (#38309)
(cherry picked from commit 477d9fa87e3cd7476f19930d60d23e347e46e658)
2023-11-24 21:28:38 +00:00
Deepesh Garg
64d9c5d61c
Merge pull request #38316 from frappe/mergify/bp/version-15-hotfix/pr-38269
fix: skip fixed assets in product bundle (backport #38269)
2023-11-24 16:30:29 +05:30
Deepesh Garg
18f9650188
Merge pull request #38325 from frappe/mergify/bp/version-15-hotfix/pr-38273
fix: annual income and expenses in email digest (#38273)
2023-11-24 16:29:43 +05:30
Gursheen Anand
b9a1fac7d8 fix: fiscal year using future date
(cherry picked from commit 728cc9f725264e057d9331362b256ea8d0f80b83)
2023-11-24 09:51:31 +00:00
Gursheen Anand
ca2ad175d3 fix: annual income and expenses in digest
(cherry picked from commit 52305e3000decb84aad1a99557e13a0bb2b68ec4)
2023-11-24 09:51:30 +00:00