Nabin Hait 34c551d9a5 fix: Missing commits from hotfix branch (#17997) ... * fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases		2019-07-03 10:34:31 +05:30
..
__init__.py	[Setup Wizard] Use setup stages (#12000)	2017-12-21 11:55:58 +05:30
company_setup.py	File api (#15637)	2018-10-15 10:38:53 +05:30
default_website.py	Website: Product Configurator and Bootstrap 4 (#15965)	2019-03-19 11:48:32 +05:30
defaults_setup.py	fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891	2019-02-09 21:10:29 +05:30
install_fixtures.py	feat: add fixtures	2019-06-06 14:17:07 +05:30
sample_data.py	fix: Missing commits from hotfix branch (#17997)	2019-07-03 10:34:31 +05:30
taxes_setup.py	Merge branch 'master' into staging-fixes	2018-10-09 17:55:33 +05:30