This reverts commit aa196c0a667ee7c3f2400fc7bd65319ccbb25a5a

This commit is contained in:
Deepesh Garg 2020-05-30 11:37:36 +05:30
parent dfa32a77c1
commit f8550790fa
7 changed files with 7 additions and 9 deletions

View File

@ -753,7 +753,7 @@
"depends_on": "is_fixed_asset", "depends_on": "is_fixed_asset",
"fetch_from": "item_code.asset_category", "fetch_from": "item_code.asset_category",
"fieldname": "asset_category", "fieldname": "asset_category",
"fieldtype": "Link", "fieldtype": "Data",
"label": "Asset Category", "label": "Asset Category",
"options": "Asset Category", "options": "Asset Category",
"read_only": 1 "read_only": 1

View File

@ -58,7 +58,8 @@ def make_depreciation_entry(asset_name, date=None):
"account": accumulated_depreciation_account, "account": accumulated_depreciation_account,
"credit_in_account_currency": d.depreciation_amount, "credit_in_account_currency": d.depreciation_amount,
"reference_type": "Asset", "reference_type": "Asset",
"reference_name": asset.name "reference_name": asset.name,
"cost_center": ""
} }
debit_entry = { debit_entry = {

View File

@ -2,7 +2,6 @@
{ {
"doctype": "Opportunity", "doctype": "Opportunity",
"name": "_Test Opportunity 1", "name": "_Test Opportunity 1",
"company": "Wind Power LLC",
"opportunity_from": "Lead", "opportunity_from": "Lead",
"enquiry_type": "Sales", "enquiry_type": "Sales",
"party_name": "_T-Lead-00001", "party_name": "_T-Lead-00001",

View File

@ -32,8 +32,7 @@
"is_active": 1, "is_active": 1,
"is_default": 1, "is_default": 1,
"item": "_Test Item Home Desktop Manufactured", "item": "_Test Item Home Desktop Manufactured",
"quantity": 1.0, "quantity": 1.0
"company": "_Test Company"
}, },
{ {
"scrap_items":[ "scrap_items":[
@ -79,8 +78,7 @@
"is_default": 1, "is_default": 1,
"currency": "USD", "currency": "USD",
"item": "_Test FG Item", "item": "_Test FG Item",
"quantity": 1.0, "quantity": 1.0
"company":"_Test Company"
}, },
{ {
"operations": [ "operations": [
@ -162,7 +160,6 @@
"currency": "USD", "currency": "USD",
"item": "_Test Variant Item", "item": "_Test Variant Item",
"quantity": 1.0, "quantity": 1.0,
"with_operations": 1, "with_operations": 1
"company": "_Test Company"
} }
] ]

View File

@ -437,6 +437,7 @@ def install_defaults(args=None):
global_defaults.update({ global_defaults.update({
'current_fiscal_year': current_fiscal_year.name, 'current_fiscal_year': current_fiscal_year.name,
'default_currency': args.get('currency'), 'default_currency': args.get('currency'),
'default_company':args.get('company_name') ,
"country": args.get("country"), "country": args.get("country"),
}) })