fix: travis
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index ef90b94..5e073f8 100644
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/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",
diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py
index c50211e..ad671ba 100644
--- a/erpnext/assets/doctype/asset/depreciation.py
+++ b/erpnext/assets/doctype/asset/depreciation.py
@@ -58,8 +58,7 @@
"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 = {
diff --git a/erpnext/crm/doctype/opportunity/test_records.json b/erpnext/crm/doctype/opportunity/test_records.json
index a1e0ad9..0a6c29b 100644
--- a/erpnext/crm/doctype/opportunity/test_records.json
+++ b/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",
diff --git a/erpnext/healthcare/setup.py b/erpnext/healthcare/setup.py
index 2087f49..224dc8d 100644
--- a/erpnext/healthcare/setup.py
+++ b/erpnext/healthcare/setup.py
@@ -198,7 +198,8 @@
{
"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)
diff --git a/erpnext/manufacturing/doctype/bom/test_records.json b/erpnext/manufacturing/doctype/bom/test_records.json
index 25730f9..3913268 100644
--- a/erpnext/manufacturing/doctype/bom/test_records.json
+++ b/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"
}
]
diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index ebd7b50..432df5b 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -435,7 +435,6 @@
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"),
})
diff --git a/erpnext/www/book-appointment/__init__.py b/erpnext/www/book-appointment/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/www/book-appointment/__init__.py
diff --git a/erpnext/www/book-appointment/verify/__init__.py b/erpnext/www/book-appointment/verify/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/www/book-appointment/verify/__init__.py