nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into payment-terms

Browse Source
This commit is contained in:
tunde
2017-10-19 17:47:31 +01:00
parent 37c2b6116c bb60a59b96
commit 09ce68ec19
160 changed files with 3729 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/tests/ui/make_fixtures.js
View File

@@ -250,7 +250,9 @@ QUnit.test('Make fixtures', assert => {
let done = assert.async();
let tasks = [];
Object.keys(frappe.test_data).forEach(function(doctype) {
tasks.push(function() { return frappe.tests.setup_doctype(doctype); });
tasks.push(function() {
return frappe.tests.setup_doctype(doctype, frappe.test_data[doctype]);
});
});
frappe.run_serially(tasks).then(() => done());
});

6
erpnext/tests/ui/tests.txt
View File

@@ -129,4 +129,8 @@ erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_material_issue_with
erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_repack.js
erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_serialize_item.js
erpnext/accounts/doctype/payment_entry/tests/test_payment_against_invoice.js
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_last_purchase_rate.js
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_last_purchase_rate.js
erpnext/restaurant/doctype/restaurant/test_restaurant.js
erpnext/restaurant/doctype/test_restaurant_table/test_restaurant_table.js
erpnext/restaurant/doctype/restaurant_menu/test_restaurant_menu.js
erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js