CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 03:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,028 Commits 425 Branches 1,723 Tags
f27e591d88c19c0fe7e7a922b5d4e19d43986ece
Commit Graph

52028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
1c5178f202 Merge pull request #44686 from ruthra-kumar/backport_v15_pr_42989 
fix: Wrong allocated_amount for sales_team in gross_profit report (backport 42989)
 2024-12-13 12:39:38 +05:30
Diógenes Souza
328b9e7d9e fix: Wrong allocated_amount for sales_team in gross_profit report (#42989) 
* fix: Wrong allocated_amount for sales_team in gross_profit report

* style: Removes whitespaces

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2024-12-13 11:58:37 +05:30
ruthra kumar
eebb1a24bc Merge pull request #44684 from frappe/backport_v15_pr_44621 
fix: add doc.status to translation from POS (backport #44621)
 2024-12-13 10:33:49 +05:30
mahsem
0ba6e60608 fix: add doc.status to translation from POS 2024-12-13 10:31:47 +05:30
Frappe PR Bot
6e01a9b84d chore(release): Bumped to Version 15.45.5 
## [15.45.5](https://github.com/frappe/erpnext/compare/v15.45.4...v15.45.5) (2024-12-12)

### Bug Fixes

* 'Use Multi-Level BOM' checkbox default value (backport [#44618](https://github.com/frappe/erpnext/issues/44618)) ([#44620](https://github.com/frappe/erpnext/issues/44620)) ([5cd3994](5cd39941ee))
* add docstatus for translation ([47e1ed1](47e1ed1eff))
* add label strings for translation in pos_controller.js ([ffdd7cf](ffdd7cfa86))
* add labels for translation in production_analytics.py ([7a6cb0f](7a6cb0f157))
* add labels for translation in purchase_order_analysis.py ([f06827c](f06827c6fb))
* add labels for translation in quality_inspection_summary.py ([dd3a747](dd3a747af4))
* add labels for translation in sales_order_analysis.py ([6980d1e](6980d1e142))
* add labels for translation in sales_order.js ([283043e](283043eba7))
* add string for translation in delayed_tasks_summary.py ([43fc8bf](43fc8bf74e))
* add strings for translation in pos_item_cart.js ([71d8dfb](71d8dfb401))
* add strings for translation in timesheet.js ([#44496](https://github.com/frappe/erpnext/issues/44496)) ([106671a](106671a414))
* add strings for translation payment_terms_status_for_sales_order.py ([773e03f](773e03f84f))
* add title for translation in  asset.js ([843ff18](843ff18cf9))
* **Bank Transaction:** error in party matching should not block submitting (backport [#44416](https://github.com/frappe/erpnext/issues/44416)) ([#44574](https://github.com/frappe/erpnext/issues/44574)) ([31c2b81](31c2b818bd))
* BOM for variant items (backport [#44580](https://github.com/frappe/erpnext/issues/44580)) ([#44584](https://github.com/frappe/erpnext/issues/44584)) ([0b26827](0b268279cf))
* BOM has not attr required items (backport [#44598](https://github.com/frappe/erpnext/issues/44598)) ([#44600](https://github.com/frappe/erpnext/issues/44600)) ([608eaaa](608eaaa482))
* BOM name issue (backport [#44575](https://github.com/frappe/erpnext/issues/44575)) ([#44579](https://github.com/frappe/erpnext/issues/44579)) ([03ae9e2](03ae9e27be))
* BOM name issue (backport [#44586](https://github.com/frappe/erpnext/issues/44586)) ([#44589](https://github.com/frappe/erpnext/issues/44589)) ([a5cc307](a5cc307417))
* consider zero valuation rate for serial nos (backport [#44532](https://github.com/frappe/erpnext/issues/44532)) ([#44534](https://github.com/frappe/erpnext/issues/44534)) ([3771c6e](3771c6eeae))
* correct color for draft in list view ([cce1cc6](cce1cc6674))
* currency symbol in SCO and SCR (backport [#44577](https://github.com/frappe/erpnext/issues/44577)) ([#44594](https://github.com/frappe/erpnext/issues/44594)) ([2a17ecd](2a17ecdc39))
* description overwrite on qty change (backport [#44606](https://github.com/frappe/erpnext/issues/44606)) ([#44609](https://github.com/frappe/erpnext/issues/44609)) ([243bf54](243bf542c4))
* do not allow to inward same serial nos multiple times (backport [#44617](https://github.com/frappe/erpnext/issues/44617)) ([#44619](https://github.com/frappe/erpnext/issues/44619)) ([bdb60a5](bdb60a51c3))
* duplicate required items in the CSV (backport [#44498](https://github.com/frappe/erpnext/issues/44498)) ([#44507](https://github.com/frappe/erpnext/issues/44507)) ([539c5b7](539c5b7974))
* incorrect stock UOM for BOM raw materials (backport [#44528](https://github.com/frappe/erpnext/issues/44528)) ([#44531](https://github.com/frappe/erpnext/issues/44531)) ([f4aa4c9](f4aa4c9466))
* inv dimensions fields not creating for standard doctype (backport [#44504](https://github.com/frappe/erpnext/issues/44504)) ([#44515](https://github.com/frappe/erpnext/issues/44515)) ([8733eda](8733eda576))
* make projected qty editable after submit (backport [#44670](https://github.com/frappe/erpnext/issues/44670)) ([#44671](https://github.com/frappe/erpnext/issues/44671)) ([bd9c84d](bd9c84d3b7))
* not able to make PO for returned qty from material request (backport [#44540](https://github.com/frappe/erpnext/issues/44540)) ([#44547](https://github.com/frappe/erpnext/issues/44547)) ([5ef063c](5ef063c634))
* not able to make sales return entry (backport [#44605](https://github.com/frappe/erpnext/issues/44605)) ([#44613](https://github.com/frappe/erpnext/issues/44613)) ([04b07a9](04b07a9e1c))
* precision check for salvage value ([ef5a564](ef5a5643dc))
* prevent set_payment_schedule on return documents ([2560beb](2560beb695))
* required by date in the reorder material request (backport [#44497](https://github.com/frappe/erpnext/issues/44497)) ([#44509](https://github.com/frappe/erpnext/issues/44509)) ([07df87a](07df87ab69))
* restrict advance payment entries with flag ([98bd5f2](98bd5f20c4))
* strings for translation in pos_past_order_summary.js ([ceec5fd](ceec5fdb6c))
* update free item qty while adding same item in seperate row ([f88dc26](f88dc263d5))
* update qty in SABB if qty changed in stock reco (backport [#44542](https://github.com/frappe/erpnext/issues/44542)) ([#44546](https://github.com/frappe/erpnext/issues/44546)) ([99a3271](99a327155e))
* validate returned serial nos and batches (backport [#44669](https://github.com/frappe/erpnext/issues/44669)) ([#44674](https://github.com/frappe/erpnext/issues/44674)) ([33273fa](33273faccb))
* valuation rate for batch in stock reconciliation  (backport [#44657](https://github.com/frappe/erpnext/issues/44657)) ([#44664](https://github.com/frappe/erpnext/issues/44664)) ([2466e4c](2466e4c2fd))
* variant qty while making work order from BOM (backport [#44548](https://github.com/frappe/erpnext/issues/44548)) ([#44551](https://github.com/frappe/erpnext/issues/44551)) ([63b1df3](63b1df38a8))
v15.45.5 		2024-12-12 10:45:52 +00:00
ruthra kumar
911ec37d13 Merge pull request #44640 from frappe/version-15-hotfix 
chore: release v15
 2024-12-12 16:14:23 +05:30
mergify[bot]
33273faccb fix: validate returned serial nos and batches (backport #44669) (#44674) 
fix: validate returned serial nos and batches (#44669)

(cherry picked from commit 4385349e36)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-12 15:44:28 +05:30
mergify[bot]
bd9c84d3b7 fix: make projected qty editable after submit (backport #44670) (#44671) 
* fix: make projected qty editable after submit (#44670)

(cherry picked from commit 9ef9ff3de8)

# Conflicts:
#	erpnext/selling/doctype/quotation_item/quotation_item.json

* chore: fix conflicts

---------

Co-authored-by: Venkatesh <47534423+venkat102@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-12 15:24:32 +05:30
mergify[bot]
2466e4c2fd fix: valuation rate for batch in stock reconciliation (backport #44657) (#44664) 
fix: valuation rate for batch in stock reconciliation  (#44657)

fix: valuation rate for batch in stock reco
(cherry picked from commit 15c7d26378)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-11 21:33:36 +05:30
Kerolles Fathy
8e33d93273 fix: apply ruff formatter changes 2024-12-11 14:14:02 +02:00
KerollesFathy
6a84f0b027 chore: resync version-15-hotfix with feature branch 2024-12-11 13:48:01 +02:00
rohitwaghchaure
44f798c3e1 Merge branch 'version-15' into version-15-hotfix 2024-12-11 16:34:48 +05:30
ruthra kumar
20186fb8fa Merge pull request #44656 from aerele/free-item-row 
fix: update free item qty while adding same item in seperate row
 2024-12-11 16:26:16 +05:30
ruthra kumar
282f133500 Merge pull request #44655 from ruthra-kumar/manual_backport_pr_44533 
refactor: consider against_voucher_no when voucher_no is filtered (backport 44533)
 2024-12-11 16:03:37 +05:30
venkat102
f88dc263d5 fix: update free item qty while adding same item in seperate row 2024-12-11 15:55:22 +05:30
ruthra kumar
7e0ff851ab refactor: consider against voucher when not filtered on voucher_no 2024-12-11 15:40:56 +05:30
Khushi Rawat
f3cf28a4f4 Merge pull request #44642 from khushi8112/backport-v15-pr-44631 
fix: precision check for salvage value (backport #44631)
 2024-12-10 16:23:13 +05:30
Khushi Rawat
ef5a5643dc fix: precision check for salvage value 2024-12-10 15:17:04 +05:30
Deepesh Garg
925eb4449e Merge pull request #44637 from frappe/mergify/bp/version-15/pr-44554 
chore: Ignore stock validation for non-stock invoices (#44549)
 2024-12-10 14:47:29 +05:30
mergify[bot]
815c6b4234 chore: Ignore stock validation for non stock invoices (backport #44549) (#44554) 
chore: Ignore stock validation for non stock invoices (#44549)

* chore: Ignore stock validation for non stock invoices

* chore: Ignore stock validation for non stock invoices

(cherry picked from commit 1ac292285e)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 06ac21dd85)
 2024-12-10 09:16:37 +00:00
mergify[bot]
5cd39941ee fix: 'Use Multi-Level BOM' checkbox default value (backport #44618) (#44620) 
fix: 'Use Multi-Level BOM' checkbox default value (#44618)

(cherry picked from commit f5c038cd1b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-10 10:57:20 +05:30
ruthra kumar
eae5996c4c Merge pull request #44622 from ruthra-kumar/backport_v15_pr_44545 
fix: only show advance payment entries where "book_advance_payments_in_separate_party_account" is true (backport #44545)
 2024-12-10 07:28:53 +05:30
ljain112
98bd5f20c4 fix: restrict advance payment entries with flag 
where "book_advance_payments_in_separate_party_account" is true
 2024-12-09 20:57:24 +05:30
mergify[bot]
bdb60a51c3 fix: do not allow to inward same serial nos multiple times (backport #44617) (#44619) 
* fix: do not allow to inward same serial nos multiple times (#44617)

(cherry picked from commit 616bb383c5)

# Conflicts:
#	erpnext/patches.txt

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-09 20:30:45 +05:30
mergify[bot]
04b07a9e1c fix: not able to make sales return entry (backport #44605) (#44613) 
fix: not able to make sales return entry (#44605)

(cherry picked from commit 314c7b8d2a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-09 19:11:49 +05:30
mergify[bot]
243bf542c4 fix: description overwrite on qty change (backport #44606) (#44609) 
fix: description overwrite on qty change (#44606)

(cherry picked from commit 9ad79625e0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-09 14:56:10 +05:30
ruthra kumar
0bb7c889ae Merge pull request #44612 from frappe/mergify/bp/version-15-hotfix/pr-44513 
fix: correct color for draft in list view (backport #44513)
 2024-12-09 14:08:04 +05:30
ljain112
cce1cc6674 fix: correct color for draft in list view 
(cherry picked from commit 143acf2330)
 2024-12-09 08:04:53 +00:00
ruthra kumar
c6c5587cc6 Merge pull request #44610 from ruthra-kumar/backport_v15_44495 
fix: prevent set_payment_schedule on return documents
 2024-12-09 13:34:07 +05:30
ruthra kumar
2560beb695 fix: prevent set_payment_schedule on return documents 2024-12-09 12:58:20 +05:30
ruthra kumar
80f2fc8e64 Merge pull request #44603 from frappe/mergify/bp/version-15-hotfix/pr-44582 
fix: add doc.status for translation (backport #44582)
 2024-12-09 12:09:13 +05:30
mahsem
47e1ed1eff fix: add docstatus for translation 
(cherry picked from commit dda272220b)
 2024-12-09 05:52:16 +00:00
Frappe PR Bot
3c8abe41e7 chore(release): Bumped to Version 15.45.4 
## [15.45.4](https://github.com/frappe/erpnext/compare/v15.45.3...v15.45.4) (2024-12-08)

### Bug Fixes

* BOM has not attr required items (backport [#44598](https://github.com/frappe/erpnext/issues/44598)) ([#44600](https://github.com/frappe/erpnext/issues/44600)) ([971e474](971e474640))
v15.45.4 		2024-12-08 11:01:12 +00:00
rohitwaghchaure
70e44a4df1 Merge pull request #44601 from frappe/mergify/bp/version-15/pr-44600 
fix: BOM has not attr required items (backport #44598) (backport #44600)
 2024-12-08 16:29:57 +05:30
mergify[bot]
971e474640 fix: BOM has not attr required items (backport #44598) (#44600) 
fix: BOM has not attr required items (#44598)

(cherry picked from commit 42d238da14)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 608eaaa482)
 2024-12-08 10:37:46 +00:00
mergify[bot]
2a17ecdc39 fix: currency symbol in SCO and SCR (backport #44577) (#44594) 
* fix: currency symbol in SCO and SCR (#44577)

(cherry picked from commit 8806d17ef1)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
#	erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-08 16:07:06 +05:30
mergify[bot]
608eaaa482 fix: BOM has not attr required items (backport #44598) (#44600) 
fix: BOM has not attr required items (#44598)

(cherry picked from commit 42d238da14)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-08 16:06:41 +05:30
Frappe PR Bot
6f80af0355 chore(release): Bumped to Version 15.45.3 
## [15.45.3](https://github.com/frappe/erpnext/compare/v15.45.2...v15.45.3) (2024-12-08)

### Bug Fixes

* duplicate buttons ([11fc560](11fc560a88))
v15.45.3 		2024-12-08 09:23:09 +00:00
rohitwaghchaure
0c3bf2daf1 Merge pull request #44597 from rohitwaghchaure/fixed-duplicate-buttons 
fix: duplicate buttons
 2024-12-08 14:51:46 +05:30
Rohit Waghchaure
11fc560a88 fix: duplicate buttons 2024-12-08 14:44:19 +05:30
Frappe PR Bot
0cd495a128 chore(release): Bumped to Version 15.45.2 
## [15.45.2](https://github.com/frappe/erpnext/compare/v15.45.1...v15.45.2) (2024-12-07)

### Bug Fixes

* BOM name issue (backport [#44586](https://github.com/frappe/erpnext/issues/44586)) ([#44589](https://github.com/frappe/erpnext/issues/44589)) ([408a092](408a09233b))
v15.45.2 		2024-12-07 08:18:12 +00:00
rohitwaghchaure
3a98660739 Merge pull request #44593 from frappe/mergify/bp/version-15/pr-44589 
fix: BOM name issue (backport #44586) (backport #44589)
 2024-12-07 13:46:44 +05:30
rohitwaghchaure
97c91c2217 Merge branch 'version-15' into mergify/bp/version-15/pr-44589 2024-12-07 13:12:59 +05:30
rohitwaghchaure
a204abcaa5 chore: fix conflicts 2024-12-07 13:10:40 +05:30
Frappe PR Bot
3b57767d36 chore(release): Bumped to Version 15.45.1 
## [15.45.1](https://github.com/frappe/erpnext/compare/v15.45.0...v15.45.1) (2024-12-07)

### Bug Fixes

* BOM for variant items (backport [#44580](https://github.com/frappe/erpnext/issues/44580)) ([#44584](https://github.com/frappe/erpnext/issues/44584)) ([2a2d8da](2a2d8da628))
* BOM name issue (backport [#44575](https://github.com/frappe/erpnext/issues/44575)) ([#44579](https://github.com/frappe/erpnext/issues/44579)) ([27b63be](27b63beb18))
* variant qty while making work order from BOM (backport [#44548](https://github.com/frappe/erpnext/issues/44548)) ([#44551](https://github.com/frappe/erpnext/issues/44551)) ([3c50cfe](3c50cfef4e))
v15.45.1 		2024-12-07 07:35:56 +00:00
rohitwaghchaure
dc74912f5d Merge pull request #44592 from frappe/mergify/bp/version-15/pr-44584 
fix: BOM for variant items (backport #44580) (backport #44584)
 2024-12-07 13:04:33 +05:30
rohitwaghchaure
d860a5b35d Merge pull request #44591 from frappe/mergify/bp/version-15/pr-44579 
fix: BOM name issue (backport #44575) (backport #44579)
 2024-12-07 13:04:03 +05:30
rohitwaghchaure
b00cc83ae6 Merge pull request #44590 from frappe/mergify/bp/version-15/pr-44551 
fix: variant qty while making work order from BOM (backport #44548) (backport #44551)
 2024-12-07 13:03:47 +05:30
mergify[bot]
408a09233b fix: BOM name issue (backport #44586) (#44589) 
fix: BOM name issue (#44586)

(cherry picked from commit d871e21a40)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit a5cc307417)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.py
 2024-12-07 07:29:44 +00:00
mergify[bot]
a5cc307417 fix: BOM name issue (backport #44586) (#44589) 
fix: BOM name issue (#44586)

(cherry picked from commit d871e21a40)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-07 12:58:34 +05:30