CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-24 21:52:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
48,549 Commits 430 Branches 1,726 Tags
71da5d0928ba22c11bc29338094de267badf9019
Commit Graph

48549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
5e6a4d257e feat: enable automatic type annotations (backport #38452) (#38454) 
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f)

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 1da9087cc4)

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 cfd3230c75)
 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 62b4a263f8)

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 1423b38d50)

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 628ea42b63)

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

* feat: auto create SCO on PO submission

(cherry picked from commit 9ec6f1e1d6)

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

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

(cherry picked from commit 762906f240)

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

* chore: notify user on SCO creation

(cherry picked from commit 745e3bfb73)

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

(cherry picked from commit 45d5cff47d)

* fix: hold PO item ref in SCO Service Item

(cherry picked from commit 7e4dd33ab0)

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

(cherry picked from commit a2ede7d6d5)

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

(cherry picked from commit e1cea25781)

* feat: auto create PR on SCR submission

(cherry picked from commit 040cc8d22f)

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

(cherry picked from commit ca8a5b45ba)

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

(cherry picked from commit 98cba5ed30)

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

(cherry picked from commit dd80d3b9b9)

* fix: use checkbox instead of select field

(cherry picked from commit d366a91d9e)

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

* feat: Subcontracting Receipt ref in Purchase Receipt

(cherry picked from commit d891bd7fac)

* feat: SCR Item ref in PR Item

(cherry picked from commit 37b3ac7952)

* feat: provision to create PR from SCR

(cherry picked from commit 8052103197)

* chore: PR ref in SCR connections

(cherry picked from commit 096a2c8cd0)

* fix: map warehouses in return SCR

(cherry picked from commit 874766a82f)

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

(cherry picked from commit 7145b040f1)

* chore: `linter`

(cherry picked from commit 857f2b5a01)

* test: auto create SCO on PO submit

(cherry picked from commit 68585f6f2b)

* test: auto create PR on SCR submit

(cherry picked from commit 7b0cd03f88)

* fix(test): `test_auto_create_purchase_receipt`

(cherry picked from commit 3da0aa6a0b)

* 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 ef8e4191cd)
 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 6518582ed3)
 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 fddf341f44)
 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 fe5fc5bd3a)

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 1763824e5f)

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

(cherry picked from commit 01044ca8e9)

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

(cherry picked from commit 640dfab827)

* refactor: don't use `cur_frm`

(cherry picked from commit 9fadf5f426)

---------

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 8e4b591ea2)
 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 663bb8726c)

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 add238c892)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-29 09:06:34 +05:30
Frappe PR Bot
d4a3d6bbe0 chore(release): Bumped to Version 15.4.0 
# [15.4.0](https://github.com/frappe/erpnext/compare/v15.3.0...v15.4.0) (2023-11-28)

### Bug Fixes

* allow on submit for child table fields ([ac7615a](ac7615ac01))
* annual income and expenses in digest ([ca2ad17](ca2ad175d3))
* check reposting settings before allowing editable si ([25bf475](25bf475d5a))
* condition in other bundle utils ([e4d9ef1](e4d9ef1293))
* create contact if existing customer doesn't have contact ([b1b065d](b1b065daf1))
* display all item rate stop messages (backport [#38289](https://github.com/frappe/erpnext/issues/38289)) ([#38307](https://github.com/frappe/erpnext/issues/38307)) ([99c1fbf](99c1fbf9fc))
* do not set repost flag without validating voucher ([6a3c3b4](6a3c3b4cac))
* don't depreciate assets with no schedule on scrapping (backport [#38276](https://github.com/frappe/erpnext/issues/38276)) ([#38293](https://github.com/frappe/erpnext/issues/38293)) ([18613c5](18613c595f))
* filter bundle items based on disabled check ([fb517e8](fb517e823f))
* fiscal year using future date ([b9a1fac](b9a1fac7d8))
* has_product_bundle util to only check for enabled bundles ([5c12872](5c12872f70))
* job card overlap validation (backport [#38345](https://github.com/frappe/erpnext/issues/38345)) ([#38348](https://github.com/frappe/erpnext/issues/38348)) ([d6fe7eb](d6fe7eb10c))
* make parameters of `create_subscription_process` optional (and other minor fixes) ([#38360](https://github.com/frappe/erpnext/issues/38360)) ([721b429](721b429d93))
* Negative Qty and Rates in SO/PO (backport [#38252](https://github.com/frappe/erpnext/issues/38252)) ([#38357](https://github.com/frappe/erpnext/issues/38357)) ([14174df](14174df862))
* no fstring in translation (backport [#38381](https://github.com/frappe/erpnext/issues/38381)) ([#38387](https://github.com/frappe/erpnext/issues/38387)) ([c101855](c1018555a0))
* patch - Duplicate entry quality inspection parameter (backport [#38262](https://github.com/frappe/erpnext/issues/38262)) ([#38264](https://github.com/frappe/erpnext/issues/38264)) ([4c9890a](4c9890a24e))
* Payment Reco Issue and chart of account importer ([4699887](4699887f1c))
* serial no status (backport [#38391](https://github.com/frappe/erpnext/issues/38391)) ([#38397](https://github.com/frappe/erpnext/issues/38397)) ([b65c225](b65c22579d))
* Server Error while creating Product Bundle (backport [#38377](https://github.com/frappe/erpnext/issues/38377)) ([#38380](https://github.com/frappe/erpnext/issues/38380)) ([922aef6](922aef665b))
* skip disabled bundles for non-report utils ([3d46b32](3d46b323b3))
* skip fixed assets in parent ([314a91a](314a91ac4d))
* Supplier `Primary Contact` (backport [#38268](https://github.com/frappe/erpnext/issues/38268)) ([#38286](https://github.com/frappe/erpnext/issues/38286)) ([37d1f1a](37d1f1ac67))
* **ux:** Sales Order Stock Reservation Dialog (backport [#38261](https://github.com/frappe/erpnext/issues/38261)) ([#38344](https://github.com/frappe/erpnext/issues/38344)) ([3cbe599](3cbe59902a))
* validation for existing bundles ([c0de9c0](c0de9c0cef))

### Features

* add Bank Transaction to connections in Journal and Payment Entry (backport [#38297](https://github.com/frappe/erpnext/issues/38297)) ([#38301](https://github.com/frappe/erpnext/issues/38301)) ([72647b8](72647b8624))
* add disabled field in product bundle ([fcd53be](fcd53be188))
* new Report "Lost Quotations" ([#38309](https://github.com/frappe/erpnext/issues/38309)) ([ea2c348](ea2c3487a3))

### Performance Improvements

* optimize total_purchase_cost update ([deed9f5](deed9f5840))
v15.4.0 		2023-11-28 16:24:28 +00:00
rohitwaghchaure
4bfdab93ad Merge pull request #38383 from frappe/version-15-hotfix 
chore: release v15
 2023-11-28 21:53:16 +05:30
mergify[bot]
c1018555a0 fix: no fstring in translation (backport #38381) (#38387) 
fix: no fstring in translation (#38381)

(cherry picked from commit 8f00481c5f)

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 23b0b8ba36)
 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 592fc81260)

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 aee2e12f39)
 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 729fc738af)

* fix: don't select all fields

(cherry picked from commit 8c3713b649)

---------

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 ad3634be7c)

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 5a53a4b044)
 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 592ce45da7)
 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 b9f5a1c85d)

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 894ae1fe0f)
 2023-11-27 03:35:39 +00:00
Gursheen Anand
ac7615ac01 fix: allow on submit for child table fields 
(cherry picked from commit 5fae2f6d57)

# 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 ad5edbb1de)
 2023-11-27 03:35:38 +00:00
Gursheen Anand
85bd649c64 refactor: validate reposting settings for editables inv 
(cherry picked from commit 780b827adc)
 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 9c889b37fb)

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

(cherry picked from commit 73586fd9b2)

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

(cherry picked from commit 2a41da94d4)

---------

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 5426b93387)

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 d8245cef72)

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 477d9fa87e)
 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 728cc9f725)
 2023-11-24 09:51:31 +00:00
Gursheen Anand
ca2ad175d3 fix: annual income and expenses in digest 
(cherry picked from commit 52305e3000)
 2023-11-24 09:51:30 +00:00