Nabin Hait 570e29d5e7 Fixed merge conflict

2018-01-17 18:56:02 +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

Set due date in purchase invoice based on suppler invoice date (#12395)

2018-01-17 16:23:04 +05:30

buying_controller.py

resolved merge conflicts

2018-01-09 12:05:20 +05:30

item_variant.py

Merge branch 'master' into develop

2017-12-15 12:53:56 +05:30

print_settings.py

…

queries.py

resolved merge conflicts

2018-01-12 16:58:32 +05:30

sales_and_purchase_return.py

Invalid return against purchase invoice Error - Issue#11834 (#11835)

2017-12-04 11:16:34 +05:30

selling_controller.py

[Enhance] Provision to show inclusive tax in print (#12345)

2018-01-08 15:20:15 +05:30

status_updater.py

…

stock_controller.py

…

taxes_and_totals.py

[Enhance] New print format for UAE/KSA for vat/excise (#12202)

2017-12-28 14:20:13 +05:30

trends.py

…

website_list_for_contact.py

…