nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-02 04:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,200 Commits 455 Branches 1,744 Tags
939b7f7cbf91c87663eafdffce0cd8e7be0736db
Commit Graph

46200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
bec7fb5493 fix(ux): make valuation field read only when it can't be modified (backport #38450) (#38463) 
* fix(ux): make `basic_rate` field read-only based on purpose

(cherry picked from commit abc7d30024)

* fix(ux): make PR `rate` field read-only having PO ref

(cherry picked from commit ae294ee470)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

* fix(ux): make PI `rate` field read-only having PR ref

(cherry picked from commit 3d4156cc7d)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-30 17:32:58 +05:30
Frappe PR Bot
7b6f25cb9e chore(release): Bumped to Version 14.52.1 
## [14.52.1](https://github.com/frappe/erpnext/compare/v14.52.0...v14.52.1) (2023-11-30)

### Bug Fixes

* use flt on outstanding on AR/AP summary report ([161b0da](161b0da29a))
v14.52.1 		2023-11-30 11:36:02 +00:00
ruthra kumar
865288976c Merge pull request #38459 from frappe/mergify/bp/version-14/pr-38457 
fix: use flt on outstanding on AR/AP summary report (backport #38457)
 2023-11-30 17:04:42 +05:30
ruthra kumar
00347cdc8e Merge pull request #38460 from frappe/mergify/bp/version-14-hotfix/pr-38457 
refactor: use flt on outstanding on AR/AP summary report (backport #38457)
 2023-11-30 16:52:15 +05:30
ruthra kumar
161b0da29a fix: use flt on outstanding on AR/AP summary report 
(cherry picked from commit e4bdd3a28d)
 2023-11-30 16:43:58 +05:30
ruthra kumar
b7556f9b30 refactor: use flt on outstanding on AR/AP summary report 
(cherry picked from commit e4bdd3a28d)
 2023-11-30 16:28:13 +05:30
Gursheen Kaur Anand
2b570ed68c Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-38250 2023-11-30 14:15:12 +05:30
ruthra kumar
d82a123cf8 Merge pull request #38447 from frappe/mergify/bp/version-14-hotfix/pr-38446 
refactor: pass on filter to up front outstanding query as well (backport #38446)
 2023-11-30 13:18:43 +05:30
ruthra kumar
e8ea6022f0 refactor: pass on filter to upfront outstanding query as well 
(cherry picked from commit cfd3230c75)
 2023-11-30 07:26:29 +00:00
mergify[bot]
2908d966b6 fix: exploded items in Subcontracting Receipt (backport #38441) (#38444) 
* fix: exploded items in Subcontracting Receipt

(cherry picked from commit 62b4a263f8)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-30 12:15:52 +05:30
mergify[bot]
2dc4b02fc8 fix: use docstatus instead of status (backport #38439) (#38442) 
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:11:53 +05:30
Deepesh Garg
f9f65a53fb Merge pull request #38430 from frappe/mergify/bp/version-14-hotfix/pr-38429 
fix(minor): set capital WIP account before asset tests (#38429)
 2023-11-30 08:14:58 +05:30
Gursheen Anand
ecde1d58b5 fix: set cwip account before asset tests 
(cherry picked from commit ef8e4191cd)
 2023-11-29 13:21:46 +00:00
Gursheen Anand
7fa97fa7b5 fix: unset discount amount based on coupon code 
(cherry picked from commit 6518582ed3)

# Conflicts:
#	erpnext/public/js/utils/sales_common.js
 2023-11-29 10:25:18 +00:00
rohitwaghchaure
72db68dd39 Merge pull request #38410 from frappe/mergify/bp/version-14-hotfix/pr-38165 
fix: make create button translatable (backport #38165)
 2023-11-29 13:04:34 +05:30
rohitwaghchaure
d0224cecac Merge pull request #38418 from frappe/mergify/bp/version-14-hotfix/pr-38415 
fix: incorrect ordered qty for Subcontracting Order (backport #38415)
 2023-11-29 13:03:04 +05:30
mergify[bot]
49296cd5cb fix: OperationalError while selecting Serial No in Warranty Claim (backport #38394) (#38413) 
* refactor: use arrow function

(cherry picked from commit 1763824e5f)

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

(cherry picked from commit 01044ca8e9)

# Conflicts:
#	erpnext/support/doctype/warranty_claim/warranty_claim.json

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

(cherry picked from commit 640dfab827)

* refactor: don't use `cur_frm`

(cherry picked from commit 9fadf5f426)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-29 12:27:03 +05:30
s-aga-r
55e4951445 chore: conflicts 2023-11-29 12:25:16 +05:30
rohitwaghchaure
8e370876cc fix: incorrect ordered qty for Subcontracting Order (#38415) 
(cherry picked from commit fddf341f44)

# Conflicts:
#	erpnext/controllers/tests/test_subcontracting_controller.py
 2023-11-29 06:52:34 +00:00
Patrick Eissler
c71b31e3b8 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:53:26 +00:00
Deepesh Garg
44b11750d3 chore: v14 patch release (#38408) 
* feat: shift depreciation for assets [v14] [backport of #38327] (#38404)

feat: shift depreciation for assets

* fix: no fstring in translation (#38381)

fix: no fstring in translation (#38381)

(cherry picked from commit 8f00481c5f)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

* 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>

* 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>

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Dany Robert <danyrt@wahni.com>
 2023-11-29 10:20:53 +05:30
mergify[bot]
d337533907 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:09:08 +05:30
mergify[bot]
fd6a23cf41 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:07:42 +05:30
mergify[bot]
cec25740ea fix: no fstring in translation (#38381) 
fix: no fstring in translation (#38381)

(cherry picked from commit 8f00481c5f)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-11-29 09:06:04 +05:30
Frappe PR Bot
9170ffc371 chore(release): Bumped to Version 14.52.0 
# [14.52.0](https://github.com/frappe/erpnext/compare/v14.51.0...v14.52.0) (2023-11-29)

### Features

* shift depreciation for assets [v14] [backport of [#38327](https://github.com/frappe/erpnext/issues/38327)] ([#38404](https://github.com/frappe/erpnext/issues/38404)) ([53d083a](53d083a121))
v14.52.0 		2023-11-29 00:48:28 +00:00
Anand Baburajan
6c805fff15 Merge pull request #38405 from frappe/mergify/bp/version-14/pr-38404 
feat: shift depreciation for assets [v14] [backport of #38327] (backport #38404)
 2023-11-29 06:16:47 +05:30
Anand Baburajan
53d083a121 feat: shift depreciation for assets [v14] [backport of #38327] (#38404) 
feat: shift depreciation for assets
(cherry picked from commit d8c3935e64)
 2023-11-29 00:46:14 +00:00
Anand Baburajan
d8c3935e64 feat: shift depreciation for assets [v14] [backport of #38327] (#38404) 
feat: shift depreciation for assets
 2023-11-29 06:15:22 +05:30
Frappe PR Bot
47d37aa628 chore(release): Bumped to Version 14.51.0 
# [14.51.0](https://github.com/frappe/erpnext/compare/v14.50.0...v14.51.0) (2023-11-28)

### Bug Fixes

* Alert message and make sure invoice due dates are different for effective test ([0813f02](0813f02ca5))
* allow on submit for child table fields ([d72fbe9](d72fbe9125))
* annual income and expenses in digest ([7dce68b](7dce68bdcc))
* check reposting settings before allowing editable si ([f777d24](f777d24679))
* condition in other bundle utils ([e96ef73](e96ef7338e))
* create contact if existing customer doesn't have contact ([bb2aa90](bb2aa904b2))
* do not set repost flag without validating voucher ([3ad6d08](3ad6d0890a))
* filter bundle items based on disabled check ([8a3a068](8a3a0688ba))
* fiscal year using future date ([b0aa4ef](b0aa4efd3d))
* has_product_bundle util to only check for enabled bundles ([fd19ac5](fd19ac55e3))
* job card overlap validation (backport [#38345](https://github.com/frappe/erpnext/issues/38345)) ([#38347](https://github.com/frappe/erpnext/issues/38347)) ([9cf8955](9cf8955d24))
* Merge conflicts ([e7183e3](e7183e3ea9))
* Negative Qty and Rates in SO/PO ([#38253](https://github.com/frappe/erpnext/issues/38253)) ([50f3b01](50f3b01eb7))
* Payment Reco Issue and chart of account importer ([730a3bb](730a3bb7ce))
* Re-add no.of rows split in alert message ([fb19e7f](fb19e7f15e))
* **regional:** item wise tax calc issue ([0448d56](0448d56a4f))
* Server Error while creating Product Bundle (backport [#38377](https://github.com/frappe/erpnext/issues/38377)) ([#38379](https://github.com/frappe/erpnext/issues/38379)) ([ca6a788](ca6a78882c))
* skip disabled bundles for non-report utils ([445e9c9](445e9c9041))
* skip fixed assets in parent ([5dcd806](5dcd806176))
* stock availability not showing ([#38382](https://github.com/frappe/erpnext/issues/38382)) ([3929cc3](3929cc30ca))
* validation for existing bundles ([ae960e7](ae960e735a))

### Features

* add disabled field in product bundle ([8d5efc9](8d5efc901d))
* new Report "Lost Quotations" ([#38309](https://github.com/frappe/erpnext/issues/38309)) ([1773e31](1773e31499))
v14.51.0 		2023-11-28 16:24:55 +00:00
rohitwaghchaure
6260241c55 Merge pull request #38384 from frappe/version-14-hotfix 
chore: release v14
 2023-11-28 21:53:33 +05:30
Shariq Ansari
6871331ff3 Merge pull request #38399 from frappe/mergify/bp/version-14-hotfix/pr-38398 
fix(CRM): create contact if existing customer doesn't have contact (backport #38398)
 2023-11-28 20:45:08 +05:30
Shariq Ansari
bb2aa904b2 fix: create contact if existing customer doesn't have contact 
(cherry picked from commit 23b0b8ba36)
 2023-11-28 14:19:59 +00:00
mergify[bot]
e490bd7785 refactor(Translations): prisoner exchange with HRMS (backport #37376) (#37403) 
* refactor: migrate translations to HRMS

* chore: resolve conflicts

* style: remove whitespace

To make the linter happy

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-11-28 17:50:28 +05:30
mergify[bot]
ca6a78882c fix: Server Error while creating Product Bundle (backport #38377) (#38379) 
* 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 15:26:36 +05:30
Raffael Meyer
321ac4c5f0 style: remove whitespace (#38388) 
To make the linter happy
 2023-11-28 15:22:35 +05:30
rohitwaghchaure
3929cc30ca fix: stock availability not showing (#38382) 
fix: stock availability now showing
 2023-11-28 15:16:35 +05:30
mergify[bot]
25f67923ea chore: fix flaky test case (backport #38369) (#38372) 
chore: fix flaky test case (#38369)

(cherry picked from commit ad3634be7c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-28 08:36:46 +05:30
ruthra kumar
5dc7faba0c Merge pull request #38358 from frappe/mergify/bp/version-14-hotfix/pr-38354 
refactor: handle rounding loss on AR/AP reports (backport #38354)
 2023-11-27 12:16:27 +05:30
ruthra kumar
2aa9171027 refactor: handle rounding loss on AR/AP reports 
(cherry picked from commit 592ce45da7)
 2023-11-27 06:22:44 +00:00
mergify[bot]
730a3bb7ce fix: Payment Reco Issue and chart of account importer 
fix: Payment Reco Issue and chart of account importer
 2023-11-27 10:30:46 +05:30
ruthra kumar
e9a2b002d8 Merge pull request #38355 from frappe/mergify/bp/version-14-hotfix/pr-38081 
fix: check reposting ledger settings before setting repost flag (backport #38081)
 2023-11-27 09:28:59 +05:30
ruthra kumar
faf025454f chore: resolve conflict 2023-11-27 09:08:23 +05:30
Marica
50f3b01eb7 fix: Negative Qty and Rates in SO/PO (#38253) 
* 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
 2023-11-27 09:06:27 +05:30
Gursheen Anand
f777d24679 fix: check reposting settings before allowing editable si 
(cherry picked from commit 894ae1fe0f)
 2023-11-27 03:35:38 +00:00
Gursheen Anand
d72fbe9125 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:37 +00:00
Gursheen Anand
3ad6d0890a fix: do not set repost flag without validating voucher 
(cherry picked from commit ad5edbb1de)
 2023-11-27 03:35:37 +00:00
Gursheen Anand
776c884403 refactor: validate reposting settings for editables inv 
(cherry picked from commit 780b827adc)
 2023-11-27 03:35:37 +00:00
mergify[bot]
a4b5fc8100 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:58:04 +05:30
Deepesh Garg
b0547b5619 Merge pull request #38074 from frappe/mergify/bp/version-14-hotfix/pr-37859 
fix: `split_invoices_based_on_payment_terms` (#37859)
 2023-11-26 18:15:11 +05:30
mergify[bot]
9cf8955d24 fix: job card overlap validation (backport #38345) (#38347) 
* fix: job card overlap validation (#38345)

(cherry picked from commit d8245cef72)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-26 17:44:02 +05:30