Nabin Hait 4d22b6db30 Fixed Merge Conflict

2017-10-25 14:09:46 +05:30

..

bom

Moved company field to the top in BOM (#11283)

2017-10-25 11:46:47 +05:30

bom_explosion_item

Updated modified in bom doctypes

2017-07-05 16:09:23 +05:30

bom_item

BOM rates as per selected currency and UOM

2017-09-04 18:31:45 +05:30

bom_operation

Add operations and items to website

2017-02-14 17:18:09 +05:30

bom_scrap_item

Updated modified in bom doctypes

2017-07-05 16:09:23 +05:30

bom_update_tool

Update new bom rate while replacing BOM (#11045)

2017-10-04 15:51:34 +05:30

bom_website_item

Website data from existing child tables, layout, images

2017-02-14 17:18:09 +05:30

bom_website_operation

Website data from existing child tables, layout, images

2017-02-14 17:18:09 +05:30

manufacturing_settings

Update BOM cost in all BOMs based on latest rm rate

2017-08-22 10:49:57 +05:30

operation

Timeout increased for setting __newname (#11252)

2017-10-20 11:26:17 +05:30

production_order

Merge branch 'master' into develop

2017-10-04 14:52:32 +05:30

production_order_item

Minor improvements based on skip_transfer (#10457)

2017-08-22 19:07:16 +05:30

production_order_operation

Production Order Enhancements (#9432)

2017-07-05 13:55:41 +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

Fixed spelling errors on Production Planning Tool and manual.

2016-12-28 18:15:45 +08:00

production_planning_tool

Cleanup of schedule date functionality in Material Request

2017-10-05 18:27:37 +05:30

workstation

[ui-tests] added workstation and operation (#10044)

2017-07-24 14:34:30 +05:30

workstation_working_hour

mendatory hours field

2016-12-14 11:32:23 +05:30

__init__.py

moved modules inside erpnext folder

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