Saurabh d505d83cb6 [fix] merge conflicts

2017-12-01 16:23:46 +05:30

..

__init__.py

Delete healthcare domain items (#11567)

2017-11-14 17:15:11 +05:30

delete_healthcare_domain_default_items.py

Delete healthcare domain items (#11567)

2017-11-14 17:15:11 +05:30

remove_company_from_patient.py

Fix Patch - remove company from patient (#11819)

2017-12-01 16:10:39 +05:30

rename_net_weight_in_item_master.py

[patch] Patch added to rename net_weight field (#11798)

2017-11-30 13:52:30 +05:30

rename_translated_domains_in_en.py

[fix] set default language in local

2017-11-17 14:51:08 +05:30

repost_reserved_qty_for_production.py

Fixed reserved qty for production logic and patch for reposting (#11691)

2017-11-23 13:05:43 +05:30

set_item_name_in_production_order.py

[Fix] Item name and description in production order (#11723)

2017-11-27 12:02:13 +05:30