diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py index 127e9cb61f..100051a692 100644 --- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py +++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py @@ -10,40 +10,40 @@ def execute(filters=None): if not filters: filters = {} columns = get_columns() last_col = len(columns) - + item_list = get_items(filters) aii_account_map = get_aii_accounts() if item_list: item_tax, tax_accounts = get_tax_accounts(item_list, columns) - + data = [] for d in item_list: expense_account = d.expense_account or aii_account_map.get(d.company) - row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date, - d.supplier_name, d.credit_to, d.project_name, d.company, d.purchase_order, + row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date, + d.supplier_name, d.credit_to, d.project_name, d.company, d.purchase_order, d.purchase_receipt, expense_account, d.qty, d.base_rate, d.base_amount] for tax in tax_accounts: row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0)) total_tax = sum(row[last_col:]) row += [total_tax, d.base_amount + total_tax] - + data.append(row) - + return columns, data - - + + def get_columns(): - return [_("Item Code") + ":Link/Item:120", _("Item Name") + "::120", _("Item Group") + ":Link/Item Group:100", - _("Invoice") + ":Link/Purchase Invoice:120", _("Posting Date") + ":Date:80", _("Supplier") + ":Link/Customer:120", - _("Supplier Account") + ":Link/Account:120", _("Project") + ":Link/Project:80", _("Company") + ":Link/Company:100", - _("Purchase Order") + ":Link/Purchase Order:100", _("Purchase Receipt") + ":Link/Purchase Receipt:100", - _("Expense Account") + ":Link/Account:140", _("Qty") + ":Float:120", _("Rate") + ":Currency:120", + return [_("Item Code") + ":Link/Item:120", _("Item Name") + "::120", _("Item Group") + ":Link/Item Group:100", + _("Invoice") + ":Link/Purchase Invoice:120", _("Posting Date") + ":Date:80", _("Supplier") + ":Link/Customer:120", + _("Supplier Account") + ":Link/Account:120", _("Project") + ":Link/Project:80", _("Company") + ":Link/Company:100", + _("Purchase Order") + ":Link/Purchase Order:100", _("Purchase Receipt") + ":Link/Purchase Receipt:100", + _("Expense Account") + ":Link/Account:140", _("Qty") + ":Float:120", _("Rate") + ":Currency:120", _("Amount") + ":Currency:120"] - + def get_conditions(filters): conditions = "" - + for opts in (("company", " and company=%(company)s"), ("account", " and pi.credit_to = %(account)s"), ("item_code", " and pi_item.item_code = %(item_code)s"), @@ -53,48 +53,56 @@ def get_conditions(filters): conditions += opts[1] return conditions - + def get_items(filters): conditions = get_conditions(filters) match_conditions = frappe.build_match_conditions("Purchase Invoice") - - return frappe.db.sql("""select pi_item.parent, pi.posting_date, pi.credit_to, pi.company, - pi.supplier, pi.remarks, pi_item.item_code, pi_item.item_name, pi_item.item_group, - pi_item.project_name, pi_item.purchase_order, pi_item.purchase_receipt, + + return frappe.db.sql("""select pi_item.parent, pi.posting_date, pi.credit_to, pi.company, + pi.supplier, pi.remarks, pi.net_total, pi_item.item_code, pi_item.item_name, pi_item.item_group, + pi_item.project_name, pi_item.purchase_order, pi_item.purchase_receipt, pi_item.expense_account, pi_item.qty, pi_item.base_rate, pi_item.base_amount, pi.supplier_name - from `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pi_item + from `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pi_item where pi.name = pi_item.parent and pi.docstatus = 1 %s %s order by pi.posting_date desc, pi_item.item_code desc""" % (conditions, match_conditions), filters, as_dict=1) - + def get_aii_accounts(): return dict(frappe.db.sql("select name, stock_received_but_not_billed from tabCompany")) - + def get_tax_accounts(item_list, columns): import json item_tax = {} tax_accounts = [] - - tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail - from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice' - and docstatus = 1 and ifnull(account_head, '') != '' and category in ('Total', 'Valuation and Total') - and parent in (%s)""" % ', '.join(['%s']*len(item_list)), tuple([item.parent for item in item_list])) - - for parent, account_head, item_wise_tax_detail in tax_details: + + invoice_wise_items = {} + for d in item_list: + invoice_wise_items.setdefault(d.parent, []).append(d) + + tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, charge_type, tax_amount + from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice' + and docstatus = 1 and ifnull(account_head, '') != '' and category in ('Total', 'Valuation and Total') + and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)), tuple(invoice_wise_items.keys())) + + for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details: if account_head not in tax_accounts: tax_accounts.append(account_head) - + if item_wise_tax_detail: try: item_wise_tax_detail = json.loads(item_wise_tax_detail) for item, tax_amount in item_wise_tax_detail.items(): item_tax.setdefault(parent, {}).setdefault(item, {})[account_head] = \ flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount) - + except ValueError: continue - + elif charge_type == "Actual" and tax_amount: + for d in invoice_wise_items.get(parent, []): + item_tax.setdefault(parent, {}).setdefault(d.item_code, {})[account_head] = \ + (tax_amount * d.base_amount) / d.net_total + tax_accounts.sort() columns += [account_head + ":Currency:80" for account_head in tax_accounts] columns += ["Total Tax:Currency:80", "Total:Currency:80"] - return item_tax, tax_accounts \ No newline at end of file + return item_tax, tax_accounts diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py index 2840291c70..e3b93d008a 100644 --- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py @@ -14,36 +14,36 @@ def execute(filters=None): item_list = get_items(filters) if item_list: item_tax, tax_accounts = get_tax_accounts(item_list, columns) - + data = [] for d in item_list: - row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date, - d.customer_name, d.debit_to, d.territory, d.project_name, d.company, d.sales_order, + row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date, + d.customer_name, d.debit_to, d.territory, d.project_name, d.company, d.sales_order, d.delivery_note, d.income_account, d.qty, d.base_rate, d.base_amount] - + for tax in tax_accounts: row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0)) total_tax = sum(row[last_col:]) row += [total_tax, d.base_amount + total_tax] - + data.append(row) - + return columns, data - + def get_columns(): return [ - _("Item Code") + ":Link/Item:120", _("Item Name") + "::120", _("Item Group") + ":Link/Item Group:100", - _("Invoice") + ":Link/Sales Invoice:120", _("Posting Date") + ":Date:80", _("Customer") + ":Link/Customer:120", + _("Item Code") + ":Link/Item:120", _("Item Name") + "::120", _("Item Group") + ":Link/Item Group:100", + _("Invoice") + ":Link/Sales Invoice:120", _("Posting Date") + ":Date:80", _("Customer") + ":Link/Customer:120", _("Customer Account") + ":Link/Account:120", _("Territory") + ":Link/Territory:80", - _("Project") + ":Link/Project:80", _("Company") + ":Link/Company:100", _("Sales Order") + ":Link/Sales Order:100", - _("Delivery Note") + ":Link/Delivery Note:100", _("Income Account") + ":Link/Account:140", + _("Project") + ":Link/Project:80", _("Company") + ":Link/Company:100", _("Sales Order") + ":Link/Sales Order:100", + _("Delivery Note") + ":Link/Delivery Note:100", _("Income Account") + ":Link/Account:140", _("Qty") + ":Float:120", _("Rate") + ":Currency:120", _("Amount") + ":Currency:120" ] - + def get_conditions(filters): conditions = "" - + for opts in (("company", " and company=%(company)s"), ("account", " and si.debit_to = %(account)s"), ("item_code", " and si_item.item_code = %(item_code)s"), @@ -53,32 +53,36 @@ def get_conditions(filters): conditions += opts[1] return conditions - + def get_items(filters): conditions = get_conditions(filters) - return frappe.db.sql("""select si_item.parent, si.posting_date, si.debit_to, si.project_name, - si.customer, si.remarks, si.territory, si.company, si_item.item_code, si_item.item_name, - si_item.item_group, si_item.sales_order, si_item.delivery_note, si_item.income_account, + return frappe.db.sql("""select si_item.parent, si.posting_date, si.debit_to, si.project_name, + si.customer, si.remarks, si.territory, si.company, si.net_total, si_item.item_code, si_item.item_name, + si_item.item_group, si_item.sales_order, si_item.delivery_note, si_item.income_account, si_item.qty, si_item.base_rate, si_item.base_amount, si.customer_name - from `tabSales Invoice` si, `tabSales Invoice Item` si_item - where si.name = si_item.parent and si.docstatus = 1 %s + from `tabSales Invoice` si, `tabSales Invoice Item` si_item + where si.name = si_item.parent and si.docstatus = 1 %s order by si.posting_date desc, si_item.item_code desc""" % conditions, filters, as_dict=1) - + def get_tax_accounts(item_list, columns): import json item_tax = {} tax_accounts = [] - - tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail - from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice' + + invoice_wise_items = {} + for d in item_list: + invoice_wise_items.setdefault(d.parent, []).append(d) + + tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, charge_type, tax_amount + from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice' and docstatus = 1 and ifnull(account_head, '') != '' - and parent in (%s)""" % ', '.join(['%s']*len(item_list)), - tuple([item.parent for item in item_list])) - - for parent, account_head, item_wise_tax_detail in tax_details: + and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)), + tuple(invoice_wise_items.keys())) + + for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details: if account_head not in tax_accounts: tax_accounts.append(account_head) - + if item_wise_tax_detail: try: item_wise_tax_detail = json.loads(item_wise_tax_detail) @@ -87,9 +91,13 @@ def get_tax_accounts(item_list, columns): flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount) except ValueError: continue - + elif charge_type == "Actual" and tax_amount: + for d in invoice_wise_items.get(parent, []): + item_tax.setdefault(parent, {}).setdefault(d.item_code, {})[account_head] = \ + flt((tax_amount * d.base_amount) / d.net_total) + tax_accounts.sort() columns += [account_head + ":Currency:80" for account_head in tax_accounts] columns += ["Total Tax:Currency:80", "Total:Currency:80"] - return item_tax, tax_accounts \ No newline at end of file + return item_tax, tax_accounts