4 Commits

Author	SHA1	Message	Date
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
Pawan Mehta	6010a10ad1	Amazon MWS Connector (#15061) ... * [fix] #15054 * [fix] #15058 * codacy issues * Codacy fixes-1 * Travis Fix * fix codacy * fix codacy * review changes 1 * Custom fields and fixes * remove amazon id * remove item.json and sales_order.json * added back sales_order and item files	2018-09-05 17:16:57 +05:30
Charles-Henri Decultot	ba6f6d976d	Stripe integration corrections	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	30da37fbb8	Move Stripe to ERPNext	2018-07-13 13:05:54 +00:00