Nabin Hait 4d22b6db30 Fixed Merge Conflict

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

..

tests

[Enahance] Update variants fields defined in the Item Varianst Settings, if template updated

2017-09-21 15:41:57 +05:30

__init__.py

…

accounts_controller.py

[added] hospitality domain (#11020)

2017-10-17 12:30:34 +05:30

buying_controller.py

Cleanup of PO schedule date pull requests

2017-10-05 19:51:10 +05:30

item_variant.py

Update variant description based on attribute if not already there (#11302)

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

print_settings.py

…

queries.py

[added] hospitality domain (#11020)

2017-10-17 12:30:34 +05:30

sales_and_purchase_return.py

…

selling_controller.py

Controller init args fix (#11015)

2017-10-02 15:59:27 +05:30

status_updater.py

…

stock_controller.py

Added is_perpetual_inventory_enabled method

2017-06-20 11:26:37 +05:30

taxes_and_totals.py

Rounding Adjustment via a separate field, instead of last tax row (#10659)

2017-09-19 14:53:16 +05:30

trends.py

…

website_list_for_contact.py

[hotfix] fixed Not Permitted issue for System user while accessing documents on portal (#10725)

2017-09-10 12:04:28 +05:30