[merge conflict]
diff --git a/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt b/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt
deleted file mode 100644
index 8c11d50..0000000
--- a/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-[
- {
- "creation": "2010-08-08 17:09:35",
- "docstatus": 0,
- "modified": "2013-07-03 18:00:40",
- "modified_by": "Administrator",
- "owner": "Administrator"
- },
- {
- "doctype": "Table Mapper Detail",
- "name": "__common__",
- "parent": "Purchase Order-Purchase Invoice",
- "parentfield": "table_mapper_details",
- "parenttype": "DocType Mapper"
- },
- {
- "doctype": "Field Mapper Detail",
- "name": "__common__",
- "parent": "Purchase Order-Purchase Invoice",
- "parentfield": "field_mapper_details",
- "parenttype": "DocType Mapper"
- },
- {
- "doctype": "DocType Mapper",
- "from_doctype": "Purchase Order",
- "module": "Accounts",
- "name": "__common__",
- "ref_doc_submitted": 1,
- "to_doctype": "Purchase Invoice"
- },
- {
- "doctype": "DocType Mapper",
- "name": "Purchase Order-Purchase Invoice"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "eval: (flt(obj.amount) - flt(obj.billed_amt)) / obj.purchase_rate",
- "map": "Yes",
- "match_id": 1,
- "to_field": "qty"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "purchase_rate",
- "map": "Yes",
- "match_id": 1,
- "to_field": "rate"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "eval: flt(obj.amount) - flt(obj.billed_amt)",
- "map": "Yes",
- "match_id": 1,
- "to_field": "amount"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "eval: (flt(obj.amount) - flt(obj.billed_amt)) / flt(obj.conversion_rate)",
- "map": "Yes",
- "match_id": 1,
- "to_field": "import_amount"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "parent",
- "map": "Yes",
- "match_id": 1,
- "to_field": "purchase_order"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "name",
- "map": "Yes",
- "match_id": 1,
- "to_field": "po_detail"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "naming_series",
- "map": "No",
- "match_id": 0,
- "to_field": "naming_series"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "total_tax",
- "map": "Yes",
- "match_id": 0,
- "to_field": "total_tax"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "conversion_rate",
- "map": "Yes",
- "match_id": 0,
- "to_field": "conversion_rate"
- },
- {
- "doctype": "Table Mapper Detail",
- "from_table": "Purchase Order",
- "match_id": 0,
- "to_table": "Purchase Invoice",
- "validation_logic": "docstatus =1"
- },
- {
- "doctype": "Table Mapper Detail",
- "from_field": "po_details",
- "from_table": "Purchase Order Item",
- "match_id": 1,
- "to_field": "entries",
- "to_table": "Purchase Invoice Item",
- "validation_logic": "ifnull(billed_amt,0) < amount and docstatus = 1"
- },
- {
- "doctype": "Table Mapper Detail",
- "from_field": "purchase_tax_details",
- "from_table": "Purchase Taxes and Charges",
- "match_id": 2,
- "to_field": "purchase_tax_details",
- "to_table": "Purchase Taxes and Charges",
- "validation_logic": "docstatus =1"
- }
-]
\ No newline at end of file
diff --git a/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt b/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt
deleted file mode 100644
index 99c74ac..0000000
--- a/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt
+++ /dev/null
@@ -1,144 +0,0 @@
-[
- {
- "creation": "2010-08-08 17:09:35",
- "docstatus": 0,
- "modified": "2013-07-03 17:56:30",
- "modified_by": "Administrator",
- "owner": "Administrator"
- },
- {
- "doctype": "Table Mapper Detail",
- "name": "__common__",
- "parent": "Purchase Receipt-Purchase Invoice",
- "parentfield": "table_mapper_details",
- "parenttype": "DocType Mapper"
- },
- {
- "doctype": "Field Mapper Detail",
- "name": "__common__",
- "parent": "Purchase Receipt-Purchase Invoice",
- "parentfield": "field_mapper_details",
- "parenttype": "DocType Mapper"
- },
- {
- "doctype": "DocType Mapper",
- "from_doctype": "Purchase Receipt",
- "module": "Accounts",
- "name": "__common__",
- "ref_doc_submitted": 1,
- "to_doctype": "Purchase Invoice"
- },
- {
- "doctype": "DocType Mapper",
- "name": "Purchase Receipt-Purchase Invoice"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "eval: (flt(obj.amount) - flt(obj.billed_amt)) / obj.purchase_rate",
- "map": "Yes",
- "match_id": 1,
- "to_field": "qty"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "purchase_rate",
- "map": "Yes",
- "match_id": 1,
- "to_field": "rate"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "eval: flt(obj.amount) - flt(obj.billed_amt)",
- "map": "Yes",
- "match_id": 1,
- "to_field": "amount"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "eval: (flt(obj.amount) - flt(obj.billed_amt)) / flt(obj.conversion_rate)",
- "map": "Yes",
- "match_id": 1,
- "to_field": "import_amount"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "parent",
- "map": "Yes",
- "match_id": 1,
- "to_field": "purchase_receipt"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "prevdoc_docname",
- "map": "Yes",
- "match_id": 1,
- "to_field": "purchase_order"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "name",
- "map": "Yes",
- "match_id": 1,
- "to_field": "pr_detail"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "prevdoc_detail_docname",
- "map": "Yes",
- "match_id": 1,
- "to_field": "po_detail"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "naming_series",
- "map": "No",
- "match_id": 0,
- "to_field": "naming_series"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "net_total",
- "map": "Yes",
- "match_id": 0,
- "to_field": "net_total"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "grand_total",
- "map": "Yes",
- "match_id": 0,
- "to_field": "grand_total"
- },
- {
- "doctype": "Field Mapper Detail",
- "from_field": "total_tax",
- "map": "Yes",
- "match_id": 0,
- "to_field": "total_tax"
- },
- {
- "doctype": "Table Mapper Detail",
- "from_field": "purchase_receipt_details",
- "from_table": "Purchase Receipt Item",
- "match_id": 1,
- "to_field": "entries",
- "to_table": "Purchase Invoice Item",
- "validation_logic": "ifnull(billed_amt,0) < amount"
- },
- {
- "doctype": "Table Mapper Detail",
- "from_table": "Purchase Receipt",
- "match_id": 0,
- "to_table": "Purchase Invoice",
- "validation_logic": "docstatus=1"
- },
- {
- "doctype": "Table Mapper Detail",
- "from_field": "purchase_tax_details",
- "from_table": "Purchase Taxes and Charges",
- "match_id": 2,
- "to_field": "purchase_tax_details",
- "to_table": "Purchase Taxes and Charges",
- "validation_logic": "docstatus=1"
- }
-]
\ No newline at end of file
diff --git a/accounts/report/purchase_register/purchase_register.py b/accounts/report/purchase_register/purchase_register.py
index 655cf8c..0fbe451 100644
--- a/accounts/report/purchase_register/purchase_register.py
+++ b/accounts/report/purchase_register/purchase_register.py
@@ -58,7 +58,7 @@
row.append(invoice_tax_map.get(inv.name, {}).get(tax_acc))
# total tax, grand total, outstanding amount & rounded total
- row += [inv.other_charges_total, inv.grand_total, flt(inv.grand_total, 2), \
+ row += [inv.total_tax, inv.grand_total, flt(inv.grand_total, 2), \
inv.outstanding_amount]
data.append(row)
@@ -164,4 +164,4 @@
where name in (%s)""" % ", ".join(["%s"]*len(accounts)), tuple(accounts), as_dict=1):
account_map[acc.name] = acc.parent_account
- return account_map
\ No newline at end of file
+ return account_map