Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(UAE VAT 21): solve merge conflicts

Browse Source
This commit is contained in:
Mohammad Hasnain 2020-10-20 10:17:48 +05:30
parent 75ccb62d46
commit c08591124c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
View File

@ -998,7 +998,7 @@ def make_purchase_invoice(**args):
'expense_account': args.expense_account or '_Test Account Cost for Goods Sold - _TC', 'expense_account': args.expense_account or '_Test Account Cost for Goods Sold - _TC',
"conversion_factor": 1.0, "conversion_factor": 1.0,
"serial_no": args.serial_no, "serial_no": args.serial_no,
"stock_uom": "_Test UOM", "stock_uom": args.uom or "_Test UOM",
"cost_center": args.cost_center or "_Test Cost Center - _TC", "cost_center": args.cost_center or "_Test Cost Center - _TC",
"project": args.project, "project": args.project,
"rejected_warehouse": args.rejected_warehouse or "", "rejected_warehouse": args.rejected_warehouse or "",

6
erpnext/regional/report/uae_vat_201/test_uae_vat_201.py
View File

@ -324,12 +324,14 @@ def create_purchase_invoices():
pi = make_purchase_invoice( pi = make_purchase_invoice(
company="_Test Company UAE VAT", company="_Test Company UAE VAT",
supplier = '_Test UAE Supplier', supplier = '_Test UAE Supplier',
supplier_warehouse = '_Test UAE VAT Supplier Warehouse - _TCUV',
warehouse = '_Test UAE VAT Supplier Warehouse - _TCUV', warehouse = '_Test UAE VAT Supplier Warehouse - _TCUV',
currency = 'AED', currency = 'AED',
cost_center = 'Main - _TCUV', cost_center = 'Main - _TCUV',
expense_account = 'Cost of Goods Sold - _TCUV', expense_account = 'Cost of Goods Sold - _TCUV',
item = "_Test UAE VAT Item", item = "_Test UAE VAT Item",
do_not_save=1, do_not_save=1,
uom = "Nos"
) )
pi.append("taxes", { pi.append("taxes", {
"charge_type": "On Net Total", "charge_type": "On Net Total",
@ -341,18 +343,19 @@ def create_purchase_invoices():
pi.recoverable_standard_rated_expenses = 1 pi.recoverable_standard_rated_expenses = 1
pi.insert()
pi.submit() pi.submit()
pi = make_purchase_invoice( pi = make_purchase_invoice(
company="_Test Company UAE VAT", company="_Test Company UAE VAT",
supplier = '_Test UAE Supplier', supplier = '_Test UAE Supplier',
supplier_warehouse = '_Test UAE VAT Supplier Warehouse - _TCUV',
warehouse = '_Test UAE VAT Supplier Warehouse - _TCUV', warehouse = '_Test UAE VAT Supplier Warehouse - _TCUV',
currency = 'AED', currency = 'AED',
cost_center = 'Main - _TCUV', cost_center = 'Main - _TCUV',
expense_account = 'Cost of Goods Sold - _TCUV', expense_account = 'Cost of Goods Sold - _TCUV',
item = "_Test UAE VAT Item", item = "_Test UAE VAT Item",
do_not_save=1, do_not_save=1,
uom = "Nos"
) )
pi.append("taxes", { pi.append("taxes", {
@ -367,7 +370,6 @@ def create_purchase_invoices():
pi.recoverable_reverse_charge = 100 pi.recoverable_reverse_charge = 100
pi.insert()
pi.submit() pi.submit()