Nabin Hait 972c25f78d Fixed conflict

2016-04-14 18:25:53 +05:30

..

bom

[fix] BOM name in test_records.json

2016-04-08 16:21:03 +05:30

bom_explosion_item

[enhancement] Int, Currency, Float, Percent as not null and default to 0

2015-11-19 13:23:36 +05:30

bom_item

[enhancement] Int, Currency, Float, Percent as not null and default to 0

2015-11-19 13:23:36 +05:30

bom_operation

[enhancement] Int, Currency, Float, Percent as not null and default to 0

2015-11-19 13:23:36 +05:30

bom_replace_tool

[fix] validate BOMs in BOM Replace Tool

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

manufacturing_settings

[translations] for #4461

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

operation

[enhancement] Int, Currency, Float, Percent as not null and default to 0

2015-11-19 13:23:36 +05:30

production_order

[fix] BOM name in test_records.json

2016-04-08 16:21:03 +05:30

production_order_operation

[enhancement] Int, Currency, Float, Percent as not null and default to 0

2015-11-19 13:23:36 +05:30

production_plan_item

refactor code in Production Planning Tool

2016-02-23 18:35:44 +05:30

production_plan_material_request

Mumtiple fixes

2016-02-23 18:35:45 +05:30

production_plan_sales_order

Mumtiple fixes

2016-02-23 18:35:45 +05:30

production_planning_tool

Fixed conflict

2016-04-14 18:25:53 +05:30

workstation

[fix] Get defaults based on doctype or fieldname

2015-12-23 16:37:06 +05:30

workstation_working_hour

[enhancement] Int, Currency, Float, Percent as not null and default to 0

2015-11-19 13:23:36 +05:30

__init__.py

…