Fixed merge conflict

This commit is contained in:
Nabin Hait
2018-05-05 12:19:14 +05:30
19 changed files with 175 additions and 34 deletions

View File

@@ -36,6 +36,7 @@ def set_default_settings(args):
stock_settings.auto_indent = 1
stock_settings.auto_insert_price_list_rate_if_missing = 1
stock_settings.automatically_set_serial_nos_based_on_fifo = 1
stock_settings.set_qty_in_transactions_based_on_serial_no_input = 1
stock_settings.save()
selling_settings = frappe.get_doc("Selling Settings")