Nabin Hait 7f3da5dbb1 Fixed merge conflict

2016-11-28 14:23:51 +05:30

..

bom

[Enhancement] Currency added in the BOM

2016-11-22 12:52:20 +05:30

bom_explosion_item

[fix] make grids editable

2016-07-11 13:01:58 +05:30

bom_item

[Enhancement] Currency added in the BOM

2016-11-22 12:52:20 +05:30

bom_operation

[Enhancement] Currency added in the BOM

2016-11-22 12:52:20 +05:30

bom_replace_tool

[fix] validate BOMs in BOM Replace Tool

2016-02-24 18:51:13 +05:30

bom_scrap_item

[Enhancement] Currency added in the BOM

2016-11-22 12:52:20 +05:30

manufacturing_settings

[translations] for #4461

2015-12-10 10:34:32 +05:30

operation

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

production_order

[Enhancement] Currency added in the BOM

2016-11-22 12:52:20 +05:30

production_order_item

[fix] make grids editable

2016-07-11 13:01:58 +05:30

production_order_operation

Made operation mandatory and removed mandatory from operation desc in Production Order Operation, set operation name as desc in operation master if desc is blank

2016-08-22 15:05:50 +05:30

production_plan_item

[fix] make grids editable

2016-07-11 13:01:58 +05:30

production_plan_material_request

[fix] make grids editable

2016-07-11 13:01:58 +05:30

production_plan_sales_order

[fix] make grids editable

2016-07-11 13:01:58 +05:30

production_planning_tool

Fixed merge conflict

2016-11-21 19:13:22 +05:30

workstation

Update workstation.py

2016-11-26 09:54:00 +05:30

workstation_working_hour

[fix] make grids editable

2016-07-11 13:01:58 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30