nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into qc-back-update

Browse Source
This commit is contained in:
Marica
2021-04-01 17:40:46 +05:30
committed by GitHub
parent 9ef323fcfd 446a6df662
commit 913e7254cb
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/purchase_invoice/test_records.json
View File

@@ -43,7 +43,7 @@
} }
], ],
"grand_total": 0, "grand_total": 0,
"naming_series": "_T-BILL", "naming_series": "T-PINV-",
"taxes": [ "taxes": [
{ {
"account_head": "_Test Account Shipping Charges - _TC", "account_head": "_Test Account Shipping Charges - _TC",
@@ -167,7 +167,7 @@
} }
], ],
"grand_total": 0, "grand_total": 0,
"naming_series": "_T-Purchase Invoice-", "naming_series": "T-PINV-",
"taxes": [ "taxes": [
{ {
"account_head": "_Test Account Shipping Charges - _TC", "account_head": "_Test Account Shipping Charges - _TC",

7
erpnext/buying/doctype/supplier_scorecard/test_supplier_scorecard.py
View File

@@ -9,9 +9,7 @@ import unittest
class TestSupplierScorecard(unittest.TestCase): class TestSupplierScorecard(unittest.TestCase):
def test_create_scorecard(self): def test_create_scorecard(self):
delete_test_scorecards() doc = make_supplier_scorecard().insert()
my_doc = make_supplier_scorecard()
doc = my_doc.insert()
self.assertEqual(doc.name, valid_scorecard[0].get("supplier")) self.assertEqual(doc.name, valid_scorecard[0].get("supplier"))
def test_criteria_weight(self): def test_criteria_weight(self):
@@ -121,7 +119,8 @@ valid_scorecard = [
{ {
"weight":100.0, "weight":100.0,
"doctype":"Supplier Scorecard Scoring Criteria", "doctype":"Supplier Scorecard Scoring Criteria",
"criteria_name":"Delivery" "criteria_name":"Delivery",
"formula": "100"
} }
], ],
"supplier":"_Test Supplier", "supplier":"_Test Supplier",

1
erpnext/stock/doctype/item/test_records.json
View File

@@ -12,6 +12,7 @@
"item_name": "_Test Item", "item_name": "_Test Item",
"apply_warehouse_wise_reorder_level": 1, "apply_warehouse_wise_reorder_level": 1,
"gst_hsn_code": "999800", "gst_hsn_code": "999800",
"opening_stock": 10,
"valuation_rate": 100, "valuation_rate": 100,
"item_defaults": [{ "item_defaults": [{
"company": "_Test Company", "company": "_Test Company",