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
..
emails	fix: Project update status code and design refactored	2019-01-17 19:21:44 +05:30
form_grid	[minor] fix ellipsis style	2016-11-02 07:34:17 +05:30
generators	Merge pull request #17942 from netchampfaris/product-page-cart-disabled	2019-06-17 12:36:09 +05:30
includes	fix: Missing commits from hotfix branch (#17997)	2019-07-03 10:34:31 +05:30
pages	fix: Homepage products styling (#17912)	2019-06-14 18:15:40 +05:30
print_formats/includes	lable for discount_amount should be configurable (#15408)	2018-09-17 11:06:49 +05:30
__init__.py	Redesigned templates. Now all templates must be inside templates/pages templates/generators	2013-12-25 15:19:22 +05:30
utils.py	fix: Missing commits from hotfix branch (#17997)	2019-07-03 10:34:31 +05:30