nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 00:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,189 Commits 400 Branches 1,698 Tags
7a6cb0f157adb8a0e582e2d2c6806a2acc2e8a32
Commit Graph

50189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mahsem
7a6cb0f157 fix: add labels for translation in production_analytics.py 
(cherry picked from commit 9b09116576)
 2024-12-06 06:46:29 +00:00
ruthra kumar
7940feaa1c Merge pull request #44568 from frappe/mergify/bp/version-15-hotfix/pr-44541 
fix: add labels for translation in quality_inspection_summary.py (backport #44541)
 2024-12-06 12:16:21 +05:30
ruthra kumar
3bfb271ddc Merge pull request #44566 from frappe/mergify/bp/version-15-hotfix/pr-44558 
fix: add string for translation in delayed_tasks_summary.py (backport #44558)
 2024-12-06 12:15:57 +05:30
mahsem
dd3a747af4 fix: add labels for translation in quality_inspection_summary.py 
(cherry picked from commit 6ff4704345)
 2024-12-06 06:45:26 +00:00
mahsem
43fc8bf74e fix: add string for translation in delayed_tasks_summary.py 
(cherry picked from commit 84b54f549a)
 2024-12-06 06:44:55 +00:00
ruthra kumar
33d69222ca Merge pull request #44564 from frappe/mergify/bp/version-15-hotfix/pr-44559 
fix: add strings for translation payment_terms_status_for_sales_order.py (backport #44559)
 2024-12-06 12:13:12 +05:30
mahsem
773e03f84f fix: add strings for translation payment_terms_status_for_sales_order.py 
(cherry picked from commit 7d244051c8)
 2024-12-06 06:38:31 +00:00
ruthra kumar
e6d1f1af91 Merge pull request #44562 from frappe/mergify/bp/version-15-hotfix/pr-44560 
fix: add labels for translation in sales_order_analysis.py (backport #44560)
 2024-12-06 12:07:15 +05:30
mahsem
6980d1e142 fix: add labels for translation in sales_order_analysis.py 
(cherry picked from commit 8a554a5538)
 2024-12-06 06:09:36 +00:00
mergify[bot]
06ac21dd85 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>
 2024-12-05 22:57:09 +05:30
mergify[bot]
63b1df38a8 fix: variant qty while making work order from BOM (backport #44548) (#44551) 
fix: variant qty while making work order from BOM (#44548)

(cherry picked from commit 1571dff3ef)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-05 16:01:04 +05:30
mergify[bot]
5ef063c634 fix: not able to make PO for returned qty from material request (backport #44540) (#44547) 
fix: not able to make PO for returned qty from material request (#44540)

(cherry picked from commit 024c442087)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-05 15:52:04 +05:30
mergify[bot]
99a327155e fix: update qty in SABB if qty changed in stock reco (backport #44542) (#44546) 
fix: update qty in SABB if qty changed in stock reco (#44542)

(cherry picked from commit 7249cf0001)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-05 15:51:44 +05:30
Khushi Rawat
59c7b80a2f Merge pull request #44544 from frappe/mergify/bp/version-15-hotfix/pr-44537 
fix: add title for translation in  asset.js (backport #44537)
 2024-12-05 15:42:22 +05:30
mahsem
843ff18cf9 fix: add title for translation in asset.js 
(cherry picked from commit 61439132a4)
 2024-12-05 09:47:58 +00:00
mergify[bot]
3771c6eeae fix: consider zero valuation rate for serial nos (backport #44532) (#44534) 
fix: consider zero valuation rate for serial nos (#44532)

(cherry picked from commit 14f2b0ab0e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-05 13:46:23 +05:30
mergify[bot]
f4aa4c9466 fix: incorrect stock UOM for BOM raw materials (backport #44528) (#44531) 
fix: incorrect stock UOM for BOM raw materials (#44528)

fix: incorrect stock uom for BOM raw materials
(cherry picked from commit 5413cf9f1f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-05 12:51:25 +05:30
ruthra kumar
4f05e45698 Merge pull request #44529 from frappe/mergify/bp/version-15-hotfix/pr-44503 
fix: add strings for translation in pos_item_cart.js (backport #44503)
 2024-12-05 10:25:23 +05:30
ruthra kumar
d540c99934 chore: linter fix 
(cherry picked from commit 31efaf6dbf)
 2024-12-05 04:49:18 +00:00
mahsem
71d8dfb401 fix: add strings for translation in pos_item_cart.js 
(cherry picked from commit 4b72b60f1a)
 2024-12-05 04:49:18 +00:00
ruthra kumar
71d53dd5ef Merge pull request #44526 from frappe/mergify/bp/version-15-hotfix/pr-44512 
fix: add label strings for translation in pos_controller.js (backport #44512)
 2024-12-05 10:19:15 +05:30
mahsem
ffdd7cfa86 fix: add label strings for translation in pos_controller.js 
(cherry picked from commit bd77a5557d)
 2024-12-05 04:43:16 +00:00
ruthra kumar
3d6d560777 Merge pull request #44524 from frappe/mergify/bp/version-15-hotfix/pr-44501 
fix: strings for translation in pos_past_order_summary.js (backport #44501)
 2024-12-05 10:12:55 +05:30
ruthra kumar
2139e6fba2 Merge pull request #44522 from frappe/mergify/bp/version-15-hotfix/pr-42081 
Use better description in pos_payment.js (backport #42081)
 2024-12-05 10:12:27 +05:30
ruthra kumar
6c0949e6dd Merge pull request #44520 from frappe/mergify/bp/version-15-hotfix/pr-44500 
fix: add labels for translation in sales_order.js (backport #44500)
 2024-12-05 10:11:59 +05:30
mahsem
ceec5fdb6c fix: strings for translation in pos_past_order_summary.js 
(cherry picked from commit 23c846d4b9)
 2024-12-05 04:32:03 +00:00
mahsem
af97d3e341 refactor: translatable label on pos payments (#42081) 
* Use better description in pos_payment.js

Use Change Amount instead of Change and To Be Paid in pos_payment.js and be consistent with other strings

* change_amount_pos_payment.js

(cherry picked from commit 138ffc4e93)
 2024-12-05 04:31:01 +00:00
mahsem
283043eba7 fix: add labels for translation in sales_order.js 
(cherry picked from commit d544328ffe)
 2024-12-05 04:29:43 +00:00
mergify[bot]
8733eda576 fix: inv dimensions fields not creating for standard doctype (backport #44504) (#44515) 
fix: inv dimensions fields not creating for standard doctype (#44504)

(cherry picked from commit 353610ce61)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-05 09:45:17 +05:30
mergify[bot]
07df87ab69 fix: required by date in the reorder material request (backport #44497) (#44509) 
fix: required by date in the reorder material request (#44497)

(cherry picked from commit 4001166ecc)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-04 19:02:45 +05:30
mergify[bot]
539c5b7974 fix: duplicate required items in the CSV (backport #44498) (#44507) 
* fix: duplicate required items in the CSV (#44498)

(cherry picked from commit b4534e56e4)

# Conflicts:
#	erpnext/manufacturing/doctype/production_plan/production_plan.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-04 19:02:26 +05:30
ruthra kumar
94a0725917 Merge pull request #44499 from frappe/mergify/bp/version-15-hotfix/pr-44496 
fix: add strings for translation in timesheet.js (backport #44496)
 2024-12-04 16:21:10 +05:30
mahsem
106671a414 fix: add strings for translation in timesheet.js (#44496) 
(cherry picked from commit 6585fabdb1)
 2024-12-04 07:36:49 +00:00
ruthra kumar
3e2bc139ab Merge pull request #44491 from frappe/mergify/bp/version-15-hotfix/pr-44339 
fix: move `validate_total_debit_and_credit` from`validate` to`on_submit` in Journal Entry (backport #44339)
 2024-12-03 19:52:30 +05:30
ruthra kumar
16d0d42afe refactor: validate debit and credit on before_submit 
(cherry picked from commit c3ace82db8)
 2024-12-03 13:47:27 +00:00
vishakhdesai
63de576be6 fix: move validate_total_debit_and_credit from validate to on_submit in Journal Entry 
(cherry picked from commit 8b5d4c0236)
 2024-12-03 13:47:27 +00:00
ruthra kumar
d5a544ca69 Merge pull request #44485 from frappe/mergify/bp/version-15-hotfix/pr-44467 
fix: Multiple Fixes in Gross Profit Report (backport #44467)
 2024-12-03 19:15:15 +05:30
ruthra kumar
4a713f6b5e chore: fix typo 
(cherry picked from commit fc0122ce76)
 2024-12-03 12:01:07 +00:00
ljain112
f165e1732b fix: correct buying amount for product bundel 
(cherry picked from commit 4e6a5893e7)
 2024-12-03 12:01:07 +00:00
ljain112
ea57f2b292 fix: remove queries 
(cherry picked from commit a86b223aed)
 2024-12-03 12:01:07 +00:00
ruthra kumar
c880476cbe Merge pull request #44481 from frappe/mergify/bp/version-15-hotfix/pr-44450 
fix: calculate submitted payment entry amount for grand total (backport #44450)
 2024-12-03 15:15:40 +05:30
mergify[bot]
0a9c92fce9 fix: incorrect Gross Margin on project (backport #44461) (#44468) 
* fix: incorrect Gross Margin on project (#44461)

(cherry picked from commit 7de9c14a2c)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

* chore: resolve conflict

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2024-12-03 15:09:09 +05:30
Sugesh393
aa090beae0 test: add new unit test to validate paid amount in payment request 
(cherry picked from commit 9bee2d430c)
 2024-12-03 09:22:23 +00:00
Sugesh393
ebdacc094c fix: calculate submitted payment entry as paid amount 
(cherry picked from commit 561a159aec)
 2024-12-03 09:22:23 +00:00
ruthra kumar
0c28726ce2 Merge pull request #44480 from frappe/mergify/bp/version-15-hotfix/pr-44415 
fix: adjusted incoming rate for zero rated item in purchase receipt (backport #44415)
 2024-12-03 14:48:51 +05:30
ruthra kumar
be0604f7cf Merge pull request #44478 from frappe/mergify/bp/version-15-hotfix/pr-44373 
fix: Always Calculate `sales_incoming_rate` for Internal Transfers (backport #44373)
 2024-12-03 14:48:14 +05:30
ljain112
435280d626 fix: adjusted incoming rate for zero rated item in purchase receipt 
(cherry picked from commit 3182c6981c)
 2024-12-03 08:56:10 +00:00
Ninad1306
558d49b3d3 test: validate buying workflow 
(cherry picked from commit 94d3fc9fde)
 2024-12-03 08:48:52 +00:00
Ninad1306
05795af471 fix: always set sales incoming rate for internal transfers 
(cherry picked from commit d049c97884)
 2024-12-03 08:48:51 +00:00
ruthra kumar
38aa3769bb Merge pull request #44477 from frappe/mergify/bp/version-15-hotfix/pr-44470 
refactor(UI): Rearranging fields under new sections (backport #44470)
 2024-12-03 11:13:37 +05:30