Browse Source

fix: travis

develop
Saqib Ansari 5 years ago
parent
commit
aa196c0a66
  1. 4
      erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
  2. 3
      erpnext/assets/doctype/asset/depreciation.py
  3. 1
      erpnext/crm/doctype/opportunity/test_records.json
  4. 3
      erpnext/healthcare/setup.py
  5. 9
      erpnext/manufacturing/doctype/bom/test_records.json
  6. 1
      erpnext/setup/setup_wizard/operations/install_fixtures.py
  7. 0
      erpnext/www/book-appointment/__init__.py
  8. 0
      erpnext/www/book-appointment/verify/__init__.py

4
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

@ -761,7 +761,7 @@
"depends_on": "is_fixed_asset",
"fetch_from": "item_code.asset_category",
"fieldname": "asset_category",
"fieldtype": "Data",
"fieldtype": "Link",
"label": "Asset Category",
"options": "Asset Category",
"read_only": 1
@ -777,7 +777,7 @@
"idx": 1,
"istable": 1,
"links": [],
"modified": "2020-03-11 14:20:17.297284",
"modified": "2020-04-14 03:33:32.981331",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",

3
erpnext/assets/doctype/asset/depreciation.py

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

1
erpnext/crm/doctype/opportunity/test_records.json

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

3
erpnext/healthcare/setup.py

@ -198,7 +198,8 @@ def add_healthcare_service_unit_tree_root():
{
"doctype": "Healthcare Service Unit",
"healthcare_service_unit_name": "All Healthcare Service Units",
"is_group": 1
"is_group": 1,
"company": "Wind Power LLC"
}
]
insert_record(record)

9
erpnext/manufacturing/doctype/bom/test_records.json

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

1
erpnext/setup/setup_wizard/operations/install_fixtures.py

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

0
erpnext/www/book-appointment/__init__.py

0
erpnext/www/book-appointment/verify/__init__.py

Loading…
Cancel
Save