Nabin Hait 061d912749 Fixed merge conflict

2018-03-23 16:20:27 +05:30

..

__init__.py

[Setup Wizard] Use setup stages (#12000)

2017-12-21 11:55:58 +05:30

company_setup.py

[Setup Wizard] Use setup stages (#12000)

2017-12-21 11:55:58 +05:30

default_website.py

[Setup Wizard] Use setup stages (#12000)

2017-12-21 11:55:58 +05:30

defaults_setup.py

[Setup Wizard] Use setup stages (#12000)

2017-12-21 11:55:58 +05:30

install_fixtures.py

Fixed merge conflict

2018-03-23 16:20:27 +05:30

sample_data.py

[setup] remove sample data commit, fix namespace

2017-12-25 12:30:35 +05:30

taxes_setup.py

Companywise default tax template (#12290)

2018-01-05 12:42:02 +05:30