nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-31 07:28:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,957 Commits 622 Branches 1,804 Tags
8e6249d361bb36a4fd1ef0cfa7333265bb8933d5
Commit Graph

1949 Commits

Author SHA1 Message Date
mergify[bot]
c1983a4846 fix: Cannot read properties of undefined (reading 'work_order_closed') (backport #44117) (#44122) 
fix: Cannot read properties of undefined (reading 'work_order_closed') (#44117)

(cherry picked from commit 13834014b5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-13 16:24:12 +05:30
mergify[bot]
bce7acf9cc fix: incorrect produced qty in Production Plan Summary (backport #44112) (#44113) 
fix: incorrect produced qty in Production Plan Summary (#44112)

(cherry picked from commit 0828c74fe3)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-13 12:31:31 +05:30
mergify[bot]
6e83fec5ca fix: consider service item cost in the RM cost of the BOM (backport #43962) (#44111) 
fix: consider service item cost in the RM cost of the BOM (#43962)

(cherry picked from commit c0ffaa444c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-12 23:22:18 +05:30
mergify[bot]
a689830bff fix: validation trigger (backport #43926) (#43943) 
fix: validation trigger (#43926)

(cherry picked from commit ba9fb4effc)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-03 04:20:01 +05:30
mergify[bot]
7189daba19 fix: work order finish button not showing (backport #43875) (backport #43877) (#43904) 
fix: work order finish button not showing (backport #43875) (#43877)

* fix: work order finish button not showing (#43875)

(cherry picked from commit 0a70be5b99)

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

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

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

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-10-29 22:37:26 +05:30
mergify[bot]
1fa9030aee fix: Workspace link for Work Order Consumed Materials report (backport #43753) (#43754) 
fix: Workspace link for Work Order Consumed Materials report (#43753)

(cherry picked from commit e94ffb87cd)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-10-21 17:15:34 +05:30
mergify[bot]
492ba539e8 fix: refetch items from BOM if 'Use Multi-Level BOM' has changed usin… (backport #43672) (#43676) 
fix: refetch items from BOM if 'Use Multi-Level BOM' has changed usin… (#43672)

fix: refetch items from BOM if 'Use Multi-Level BOM' has changed using api
(cherry picked from commit 05915415de)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-15 16:47:40 +05:30
mergify[bot]
029021f035 fix: production plan bom error (backport #43591) (#43594) 
fix: production plan bom error (#43591)

(cherry picked from commit ab171326f3)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-09 15:41:21 +05:30
mergify[bot]
cf0fa0db7b fix: validation for corrective job card (backport #43555) (#43558) 
* fix: validation for corrective job card (#43555)

(cherry picked from commit 7a0a893d08)

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

* chore: fix conflicts

* chore: fix linters issue

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-08 17:40:52 +05:30
mergify[bot]
fc9a3c0c92 fix: Unknown column 'serial_no' in 'field list' (backport #43515) (#43569) 
fix: Unknown column 'serial_no' in 'field list' (#43515)

(cherry picked from commit 69127e8609)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-08 17:40:22 +05:30
mergify[bot]
86b10ce9bb fix: tests for work order consumption (backport #41814) (#43430) 
fix: tests for work order consumption (#41814)

* fix: tests for work order automatic SABB creation

* fix: qty

* chore: show created sabb

* chore: fix syntax

* fix: check SABB qty

* fix: add batched consumable to manufacture

* fix: missing fg qty field

* fix: improve test debug

* chore: linting

* chore: removed extra hash icons

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
(cherry picked from commit ca3c680909)

Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
 2024-09-29 22:06:50 +05:30
mergify[bot]
7e6d6f08a2 fix: ui clean-up (backport #43305) (#43312) 
* fix: ui clean-up (#43305)

fix: ui cleanup
(cherry picked from commit b127a0c8b7)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_creator/bom_creator.json
#	erpnext/manufacturing/doctype/plant_floor/plant_floor.json
#	erpnext/public/js/templates/visual_plant_floor_template.html

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-22 11:18:42 +05:30
mergify[bot]
8c8dc241e5 fix: bom cost update is not working (backport #43155) (#43157) 
fix: bom cost update is not working (#43155)

(cherry picked from commit 05f9015c0b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-10 23:07:07 +05:30
mergify[bot]
fee2255661 fix: validate component quantity according to BOM (backport #43011) (#43014) 
* fix: validate component quantity according to BOM (#43011)

(cherry picked from commit f3b91d4d62)

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

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-02 16:29:30 +05:30
mergify[bot]
8d8dd0cd2b feat: Disassembly Order (backport #42655) (#42957) 
* feat: Disassembly Order (#42655)

(cherry picked from commit 663a08e4cd)

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

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-27 23:07:37 +05:30
rohitwaghchaure
61280e6072 fix: not able to save BOM Creator (#42540) 2024-07-30 15:13:19 +05:30
mergify[bot]
68a39dfa33 fix: BOM Creator Recursion Error on duplicate save (backport #41622) (#42179) 
fix: BOM Creator Recursion Error on duplicate save (#41622)

(cherry picked from commit 9cfe09bdf6)

Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
 2024-07-09 12:19:10 +05:30
mergify[bot]
3b4d39766f fix: this.frm.events.update_cost is not a function (backport #41960) (#41965) 
* fix: this.frm.events.update_cost is not a function (#41960)

(cherry picked from commit d5ed4582c3)

# Conflicts:
#	erpnext/manufacturing/doctype/workstation/workstation.json
#	erpnext/manufacturing/doctype/workstation/workstation.py

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-01 18:18:58 +05:30
mergify[bot]
44c16713ba feat: default account head for operating cost (backport #41985) (#41987) 
* feat: default account head for operating cost (#41985)

(cherry picked from commit fd7666a029)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.py
#	erpnext/setup/doctype/company/company.json

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-06-22 10:39:53 +05:30
Kishan0330
164973a42c refactor: change warehousesData variable name 
(cherry picked from commit f4e369977a)
 2024-06-13 05:45:17 +00:00
Kishan0330
9cb7c279a4 fix: download materials request plan in production plan 
(cherry picked from commit 6e55651795)
 2024-06-13 05:45:17 +00:00
rohitwaghchaure
da15df1f28 Merge pull request #41869 from frappe/mergify/bp/version-15-hotfix/pr-41650 
chore: typo in bom_operation.json (backport #41650)
 2024-06-12 15:22:51 +05:30
Nihantra C. Patel
337082512e fix: download materials request plan in PP -prettier 
(cherry picked from commit a1c4e0e93c)
 2024-06-12 07:33:12 +00:00
Himanshu Shivhare
764235b390 chore: typo in bom_operation.json (#41650) 
chore: typo in bom_operation.json
(cherry picked from commit 7ee2a19f53)
 2024-06-12 07:33:11 +00:00
Nihantra C. Patel
7193633773 fix: download materials request plan in PP 
(cherry picked from commit cb52b76342)
 2024-06-12 07:33:11 +00:00
Nihantra C. Patel
ef2a6c788e fix: download materials request plan in PP 
(cherry picked from commit f4acdd9636)
 2024-06-12 07:33:11 +00:00
mergify[bot]
30c0b2bb54 fix: do not fetch items with no active BOM in PP (backport #41833) (#41835) 
fix: do not fetch items with no active BOM in PP (#41833)

(cherry picked from commit 36413d14d8)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-06-10 15:16:57 +05:30
Nabin Hait
5448d5d1cb fix: Use full name instead of abbreviation (#41759) 2024-06-04 11:41:30 +05:30
mergify[bot]
6554f192fb fix: job card time logs overlap issue (backport #41567) (#41571) 
* fix: job card time logs overlap issue (#41567)

(cherry picked from commit ac4bcd5ca7)

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

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-05-21 15:01:45 +05:30
mergify[bot]
953de995bc fix: BOM creator validation for parent row no (backport #41413) (#41558) 
fix: BOM creator validation for parent row no (#41413)

fix: bom creator valiation for parent row no
(cherry picked from commit ae3f5a38e1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-05-20 19:42:54 +05:30
mergify[bot]
7620ae203e chore(BOM Explorer): display items in the same order as in the BOM (backport #41496) (#41498) 
chore(BOM Explorer): display items in the same order as in the BOM (#41496)

(cherry picked from commit bd381cc0c6)

Co-authored-by: Samuel Danieli <23150094+scdanieli@users.noreply.github.com>
 2024-05-16 15:59:06 +05:30
mergify[bot]
8101b51899 fix: bold total in exponential smoothing forecasting (backport #41393) (#41404) 
fix: bold total in exponential smoothing forecasting (#41393)

* fix: bold total in exponential smoothing forecasting

* fix: bold total in exponential smoothing forecasting

(cherry picked from commit ba60b5911a)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
 2024-05-16 15:14:43 +05:30
rohitwaghchaure
544e56a71c fix: search not working for so in the Production Plan (#36459) 
fix: search not working for so
(cherry picked from commit 8c57d56240)
(cherry picked from commit 9a6e762b8b)
 2024-04-21 11:21:04 +00:00
Rohit Waghchaure
ef2553edf9 fix: validation for fraction number in Work Order 
(cherry picked from commit f8305c2fc0)
 2024-04-18 09:15:49 +00:00
Akhil Narang
7828eee014 fix(treewide): manual ruff fixes 
(cherry picked from commit f63396ef47)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:10 +05:30
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
Nihantra C. Patel
9f12c964dc fix: workstation refresh after prompt 
(cherry picked from commit bed1af26e3)
 2024-04-04 06:21:36 +00:00
rohitwaghchaure
ca6caa86bc chore: fix conflicts 2024-04-02 19:18:02 +05:30
rohitwaghchaure
152921b82a chore: fix conflicts 2024-04-02 19:17:41 +05:30
Rohit Waghchaure
ecc317d690 chore: remove rate of material based on Manual 
(cherry picked from commit 0b63dbf221)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.json
#	erpnext/manufacturing/doctype/bom_creator/bom_creator.json
 2024-04-02 12:42:22 +00:00
Rohit Waghchaure
87ce9d834f fix: added validation if parent id is missing in BOM Creator 
(cherry picked from commit 0a1fab762f)
 2024-04-02 09:43:37 +00:00
Rohit Waghchaure
68d57c3947 fix: incorrect total qty in job card 
(cherry picked from commit c3546cf8e2)
 2024-03-26 14:04:03 +00:00
Rohit Waghchaure
a638c9c8af fix: Batch No is mandatory while making manufacture entry 
(cherry picked from commit 43fd60a877)
 2024-03-24 13:02:10 +00:00
barredterra
f0e00daa1c refactor: usage of in_list 
(cherry picked from commit d238751e6b)
 2024-03-19 11:13:02 +00:00
mergify[bot]
917a21b989 fix: not able to delete cancelled delivery note (backport #40508) (#40510) 
fix: not able to delete cancelled delivery note (#40508)

(cherry picked from commit 7695759f3c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-18 15:26:32 +05:30
mergify[bot]
a5e6763be5 fix: if input manualy material request on WO the material_request_item is not set so validate WO give error (backport #40180) (#40421) 
fix: if input manualy material request on WO the material_request_item is not set so validate WO give error (#40180)

(cherry picked from commit f24f51b7de)

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
 2024-03-12 21:56:14 +05:30
mergify[bot]
26a1d84935 chore: Add translation to buttons in Update stock_summary_template.html (backport #40099) (#40419) 
chore: Add translation to buttons in Update stock_summary_template.html (#40099)

chore: Add translation to buttons in Update stock_summary_template.html
(cherry picked from commit f3b4237ab6)

Co-authored-by: Ernesto Ruiz <eruiz@wbapps.com>
 2024-03-12 21:31:30 +05:30
mergify[bot]
605132a31c fix: incorrect work order status (backport #40407) (#40411) 
fix: incorrect work order status (#40407)

(cherry picked from commit 948297692e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 18:34:25 +05:30
mergify[bot]
d6e87f3f17 fix: recursion issue while submitting work order (backport #40400) (#40402) 
* fix: recursion issue while submitting work order (#40400)

(cherry picked from commit 72614bb8ff)

* chore: fix linter issue

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 16:50:00 +05:30
mergify[bot]
7d3d2eb928 ci: add prettier to pre-commit (backport #40206) (#40362) 
* ci: add prettier to pre-commit

(cherry picked from commit 2c16036ef3)

* style: format js files

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-03-11 10:47:18 +05:30