nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-19 19:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,853 Commits 636 Branches 1,812 Tags
3574d490dbf2b3e71722e60a73a50d8af371a2d1
Commit Graph

1614 Commits

Author SHA1 Message Date
mergify[bot]
8ddbac5158 fix: Blanket Order (backport #34279) (#34548) 
* fix: hide `+` button based on `Blanket Order Type`

(cherry picked from commit abf9a28d6a)

* feat: add field `Over Order Allowance (%)` in `Buying Settings`

(cherry picked from commit f5937f46cb)

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

* refactor: rewrite `blanket_order.py` queries in `QB`

(cherry picked from commit f3993783a3)

* fix: don't map item row having `0` qty

(cherry picked from commit fc1088d9c4)

* feat: consider `over_order_allowance` while validating order qty

(cherry picked from commit 8bcbc45add)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* feat: add field `Over Order Allowance (%)` in `Selling Settings`

(cherry picked from commit d7da8928ac)

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

* feat: consider `over_order_allowance` while validating sales order qty

(cherry picked from commit 53701c37b1)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* test: add test cases for `Over Order Allowance` against `Blanket Order`

(cherry picked from commit 66f650061d)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-03-22 13:50:29 +05:30
s-aga-r
f4d07cc84e fix: operation time for multi-level BOM in WO 
(cherry picked from commit 442ee3adba)
 2023-03-14 13:18:29 +00:00
s-aga-r
d1171016b3 fix: required_qty get reset to 1 for Alternative Item in WO 
(cherry picked from commit 046834a97a)
 2023-03-09 04:35:58 +00:00
s-aga-r
4824302811 fix(test): TestBomStockReport 2023-03-08 17:44:51 +05:30
s-aga-r
08b9aaff26 test: add test cases for BOM Stock Report 
(cherry picked from commit b53dcb04ed)
 2023-03-08 10:56:43 +00:00
s-aga-r
eb1f8f932d fix: BOM Stock Report 
(cherry picked from commit a65b80911b)
 2023-03-08 10:56:43 +00:00
s-aga-r
7a159a7187 perf: Stock Entry (Material Transfer) 
(cherry picked from commit de18f98c5c)
 2023-03-07 12:33:46 +00:00
Rohit Waghchaure
e98b34617f fix: incorrect color in the BOM Stock Report 
(cherry picked from commit a8f03ebf7f)
 2023-02-23 04:25:45 +00:00
rohitwaghchaure
593d7f3dd6 fix: linter issue 2023-01-23 13:22:24 +05:30
Rohit Waghchaure
5ed6a74fc4 feat: provision to select date type based on filter 
(cherry picked from commit 20c8873208)
 2023-01-23 07:44:08 +00:00
rohitwaghchaure
ab2f250960 fix: linter issue 2022-12-14 23:23:19 +05:30
rohitwaghchaure
e5b3748b49 fix: get_serial_nos not defined 2022-12-14 23:06:38 +05:30
Rohit Waghchaure
eddb7b429e fix: get_serial_nos_for_fg() missing 1 required positional argument: 'args' 
(cherry picked from commit 410a58b3de)
 2022-12-14 10:38:38 +00:00
s-aga-r
50b2898a2c fix: Enough Parts to Build in BOM Stock Report 
(cherry picked from commit 723c64ba73)
 2022-12-13 09:50:30 +00:00
s-aga-r
2880469706 fix: order status in Production Planning Report 
(cherry picked from commit 632c08f7e0)
 2022-12-07 18:07:23 +00:00
Rohit Waghchaure
635d80dc2f fix: non empty FG batch picked while completing work order 
(cherry picked from commit 713330cbf6)
 2022-12-05 15:00:38 +00:00
s-aga-r
b39f367dbd chore: conflicts 2022-11-27 22:10:10 +05:30
s-aga-r
ce5419888b fix: production_item filter in Job Card Summary Report 
(cherry picked from commit ef7fd670fc)

# Conflicts:
#	erpnext/manufacturing/report/job_card_summary/job_card_summary.py
 2022-11-26 16:25:16 +00:00
s-aga-r
ffef0cb771 fix: company name with , in Job Card Summary Report 
(cherry picked from commit 481149814e)

# Conflicts:
#	erpnext/manufacturing/report/job_card_summary/job_card_summary.py
 2022-11-26 16:25:15 +00:00
s-aga-r
2de239c73b fix: Work Order filter typo in Job Card Summary Report 
(cherry picked from commit 2e4f3e9317)
 2022-11-26 16:25:14 +00:00
s-aga-r
11978fca4e fix: company name with , in Work Order Summary Report 
(cherry picked from commit 87b39f045c)
 2022-11-26 16:25:14 +00:00
Rohit Waghchaure
726c3d32be fix: incorrect fix of conversion factor in PP 
(cherry picked from commit 490b0e3cdf)
 2022-11-18 14:39:27 +00:00
s-aga-r
78ca078474 refactor: rewrite job_card.py queries in QB 
(cherry picked from commit 7df2921d38)
 2022-11-14 05:57:03 +00:00
Sagar Sharma
f09e4273d9 fix: set WIP Warehouse in Job Card 
(cherry picked from commit e7fa2e08ad)
 2022-11-10 11:43:23 +00:00
Sagar Sharma
4a177113c6 fix: don't set WIP Warehouse if is checked in WO 
(cherry picked from commit 9730cd0aec)
 2022-11-10 11:43:22 +00:00
Sagar Sharma
418c131331 fix: Material Consumption option in case of Skip Transfer to WIP in WO 
(cherry picked from commit 8ea6983734)
 2022-11-07 04:06:55 +00:00
rohitwaghchaure
447485ae90 fix: conflicts 2022-10-20 15:01:22 +05:30
Rohit Waghchaure
98bcb7255d fix: BOM cost update message 
(cherry picked from commit 9cfe527492)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/test_bom.py
 2022-10-20 09:09:02 +00:00
Rohit Waghchaure
4f0c2909ab test: validate qty and purchase uom in material request which is created from PP 
(cherry picked from commit 4d5ef721f7)
 2022-10-20 04:30:29 +00:00
Rohit Waghchaure
1741501ea8 fix: incorrect qty in material request 
(cherry picked from commit ad278b2007)
 2022-10-20 04:30:28 +00:00
Rohit Waghchaure
b5376ce5cb fix: overlap error not raised for job card in case of workstation with production capacity 
(cherry picked from commit 8b2165e0d1)
 2022-10-19 11:35:59 +00:00
Sagar Sharma
ed4ac100ba fix: consider overproduction percentage for WO finish button 
(cherry picked from commit 05392e0918)
 2022-09-27 12:15:43 +00:00
Sagar Sharma
1301a6ff7f refactor: rewrite Production Planning Report queries in QB 
(cherry picked from commit 8417b9b99c)
 2022-09-23 04:20:42 +00:00
Rohit Waghchaure
638d5e9dc3 fix: item_code key error in production plan 2022-09-22 18:09:12 +05:30
Sagar Sharma
2a9b519773 Merge branch 'version-13-hotfix' into backport/v13-h/32304 2022-09-22 01:32:20 +05:30
Sagar Sharma
882542c2d5 Merge branch 'version-13-hotfix' into backport/v13-h/32153 2022-09-22 01:31:04 +05:30
Sagar Sharma
54dfd50391 refactor: rewrite Exponential Smoothing Forecasting queries in QB 2022-09-21 21:27:04 +05:30
Sagar Sharma
45d02ceb4e refactor: rewrite Work Order Stock Report queries in QB 2022-09-21 21:20:03 +05:30
Sagar Sharma
f72bb18da7 refactor: rewrite Process Loss Report queries in QB 2022-09-21 21:13:10 +05:30
Sagar Sharma
cedc8d28e4 refactor: rewrite BOM Variance Report queries in QB 2022-09-21 12:13:05 +05:30
Sagar Sharma
96bf1e2a0a fix: warehouse filter in BOM Stock Calculated Report 
(cherry picked from commit 390ce5719d)
 2022-09-20 17:37:41 +00:00
Sagar Sharma
1f633b293d refactor: rewrite BOM Stock Report queries in QB 
(cherry picked from commit 8fd7c04920)
 2022-09-20 17:37:40 +00:00
Sagar Sharma
367e05f808 test: update test case for production plan pending-qty 
(cherry picked from commit bd6af7c613)
 2022-09-16 13:00:59 +00:00
Sagar Sharma
2dcb35da33 fix: production plan pending-qty 
(cherry picked from commit 5be7d42dfd)
 2022-09-16 13:00:58 +00:00
Sagar Sharma
b4dec4630d chore: conflicts 2022-09-16 17:08:35 +05:30
Sagar Sharma
c415a47d25 refactor: rewrite Production Plan queries in QB 
(cherry picked from commit b8cf3b4c77)

# Conflicts:
#	erpnext/manufacturing/doctype/production_plan/production_plan.py
 2022-09-16 09:30:11 +00:00
Sagar Sharma
c5c28615f5 test: add test cases for BOM Stock Calculated report 
(cherry picked from commit e1a98c1ff7)
 2022-09-12 13:52:31 +00:00
Sagar Sharma
ab32c09ff9 fix: add missing warehouse filter in BOM Stock Calculated report 
(cherry picked from commit 7a968a5f0d)
 2022-09-12 13:52:30 +00:00
Sagar Sharma
f2e63bc491 fix: required_qty in BOM Stock Calculated report 
(cherry picked from commit 56192daabf)
 2022-09-12 13:52:30 +00:00
Sagar Sharma
882aa96973 refactor: BOM Stock Calculated report 
(cherry picked from commit 723fa9eebc)
 2022-09-12 13:52:29 +00:00