nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 23:22:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolving commits

Browse Source
This commit is contained in:
Anupam
2021-03-15 11:37:46 +05:30
parent d8f7a75eae 46d5431bad
commit 4980dd616b
144 changed files with 3784 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/buying/doctype/purchase_order/test_purchase_order.py
View File

@@ -231,12 +231,12 @@ class TestPurchaseOrder(unittest.TestCase):
new_item_with_tax = frappe.get_doc("Item", "Test Item with Tax")
new_item_with_tax.append("taxes", {
"item_tax_template": "Test Update Items Template",
"item_tax_template": "Test Update Items Template - _TC",
"valid_from": nowdate()
})
new_item_with_tax.save()
tax_template = "_Test Account Excise Duty @ 10"
tax_template = "_Test Account Excise Duty @ 10 - _TC"
item = "_Test Item Home Desktop 100"
if not frappe.db.exists("Item Tax", {"parent":item, "item_tax_template":tax_template}):
item_doc = frappe.get_doc("Item", item)
@@ -287,7 +287,7 @@ class TestPurchaseOrder(unittest.TestCase):
po.cancel()
po.delete()
new_item_with_tax.delete()
frappe.get_doc("Item Tax Template", "Test Update Items Template").delete()
frappe.get_doc("Item Tax Template", "Test Update Items Template - _TC").delete()
def test_update_child_uom_conv_factor_change(self):
po = create_purchase_order(item_code="_Test FG Item", is_subcontracted="Yes")

9
erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
View File

@@ -51,6 +51,7 @@
"warehouse_and_reference",
"warehouse",
"actual_qty",
"company_total_stock",
"material_request",
"material_request_item",
"sales_order",
@@ -744,13 +745,19 @@
"label": "Available Qty at Warehouse",
"print_hide": 1,
"read_only": 1
},
{
"fieldname": "company_total_stock",
"fieldtype": "Float",
"label": "Available Qty at Company",
"read_only": 1
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2021-03-15 10:10:16.342693",
"modified": "2021-03-22 11:20:00.121296",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order Item",