Saurabh 1cfcf70905 Resolved merge conflicts

2018-07-06 13:18:44 +05:30

..

blanket_order

Make supplier_name and customer_name fields read only

2018-06-27 15:20:33 +05:30

blanket_order_item

Update ordered qty in blanket order

2018-06-14 15:56:29 +05:30

bom

Merge branch 'master' into develop

2018-06-15 09:35:06 +00:00

bom_explosion_item

Updated modified in bom doctypes

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

bom_item

[WIP] Alternative items (#13705)

2018-05-16 10:58:39 +05:30

bom_operation

operation time in grid view (#13400)

2018-03-27 10:34:05 +05:30

bom_scrap_item

Updated modified in bom doctypes

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

bom_update_tool

[Fix] BOM replace timeout issue (#14782)

2018-07-03 15:06:38 +05:30

bom_website_item

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

bom_website_operation

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

manufacturing_settings

[Enhance] Provision to set overproduction percentage for work order (#14248)

2018-05-30 15:28:09 +05:30

material_request_plan_item

[enhance] Production Plan (#12160)

2018-02-20 12:20:00 +05:30

operation

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

production_plan

Item defaults query fixes

2018-05-24 17:07:51 +05:30

production_plan_item

Production Plan, do not consider the sales orders against which work order has been created (#13800)

2018-05-16 11:07:55 +05:30

production_plan_material_request

[enhance] Production Plan (#12160)

2018-02-20 12:20:00 +05:30

production_plan_sales_order

[enhance] Production Plan (#12160)

2018-02-20 12:20:00 +05:30

production_planning_tool

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

work_order

Fixed permission issue

2018-07-04 16:38:10 +05:30

work_order_item

[Enhancement] Work Order Material Consumption (#13384)

2018-04-09 10:31:28 +05:30

work_order_operation

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

workstation

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

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

workstation_working_hour

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

__init__.py

moved modules inside erpnext folder

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