mbauskar ea832b8157 resolved merge conflicts

2017-09-14 15:32:10 +05:30

..

__init__.py

[fix] unset default customer group (#10689)

2017-09-14 15:03:45 +05:30

add_setup_progress_actions.py

Progress fixes (#10710)

2017-09-13 18:41:01 +05:30

rename_company_sales_target_field.py

[fix] [patch] rename_company_sales_target_field.py

2017-09-06 10:53:26 +05:30

set_default_customer_group.py

[fix] unset default customer group (#10689)

2017-09-14 15:03:45 +05:30

set_print_zero_amount_taxes.py

Print Settings for printing taxes with zero amount (#10782)

2017-09-14 15:17:38 +05:30