Fixed conflict

This commit is contained in:
Nabin Hait
2014-01-10 16:31:48 +05:30
30 changed files with 300 additions and 242 deletions

View File

@@ -98,7 +98,8 @@ def create_price_lists(args):
{
"doctype": "Price List",
"price_list_name": "Standard " + pl_type,
"buying_or_selling": pl_type,
"buying": 1 if pl_type == "Buying" else 0,
"selling": 1 if pl_type == "Selling" else 0,
"currency": args["currency"]
},
{