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

Merge pull request #5278 from nabinhait/report_fix1

Browse Source 
Sales / Purchase Register report fix and on item rename update item-tax json
This commit is contained in:
Nabin Hait 2016-04-29 11:41:53 +05:30
commit d8df0d3a8f
4 changed files with 118 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@ -14,7 +14,7 @@ def execute(filters=None):
item_list = get_items(filters) item_list = get_items(filters)
aii_account_map = get_aii_accounts() aii_account_map = get_aii_accounts()
if item_list: if item_list:
item_tax, tax_accounts = get_tax_accounts(item_list, columns) item_row_tax, tax_accounts = get_tax_accounts(item_list, columns)
columns.append({ columns.append({
"fieldname": "currency", "fieldname": "currency",
@ -23,7 +23,7 @@ def execute(filters=None):
"width": 80 "width": 80
}) })
company_currency = frappe.db.get_value("Company", filters.company, "default_currency") company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
print company_currency
data = [] data = []
for d in item_list: for d in item_list:
purchase_receipt = None purchase_receipt = None
@ -39,7 +39,7 @@ def execute(filters=None):
purchase_receipt, expense_account, d.qty, d.base_net_rate, d.base_net_amount] purchase_receipt, expense_account, d.qty, d.base_net_rate, d.base_net_amount]
for tax in tax_accounts: for tax in tax_accounts:
row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0)) row.append(item_row_tax.get(d.name, {}).get(tax, 0))
total_tax = sum(row[last_col:]) total_tax = sum(row[last_col:])
row += [total_tax, d.base_net_amount + total_tax, company_currency] row += [total_tax, d.base_net_amount + total_tax, company_currency]
@ -76,29 +76,40 @@ def get_items(filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
match_conditions = frappe.build_match_conditions("Purchase Invoice") match_conditions = frappe.build_match_conditions("Purchase Invoice")
return frappe.db.sql("""select pi_item.parent, pi.posting_date, pi.credit_to, pi.company, return frappe.db.sql("""
pi.supplier, pi.remarks, pi.base_net_total, pi_item.item_code, pi_item.item_name, pi_item.item_group, select
pi_item.project, pi_item.purchase_order, pi_item.purchase_receipt, pi_item.po_detail, pi_item.name, pi_item.parent, pi.posting_date, pi.credit_to, pi.company,
pi_item.expense_account, pi_item.qty, pi_item.base_net_rate, pi_item.base_net_amount, pi.supplier_name pi.supplier, pi.remarks, pi.base_net_total, pi_item.item_code, pi_item.item_name,
pi_item.item_group, pi_item.project, pi_item.purchase_order, pi_item.purchase_receipt,
pi_item.po_detail, pi_item.expense_account, pi_item.qty, pi_item.base_net_rate,
pi_item.base_net_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 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) order by pi.posting_date desc, pi_item.item_code desc
""" % (conditions, match_conditions), filters, as_dict=1)
def get_aii_accounts(): def get_aii_accounts():
return dict(frappe.db.sql("select name, stock_received_but_not_billed from tabCompany")) return dict(frappe.db.sql("select name, stock_received_but_not_billed from tabCompany"))
def get_tax_accounts(item_list, columns): def get_tax_accounts(item_list, columns):
import json import json
item_tax = {} item_row_tax = {}
tax_accounts = [] tax_accounts = []
invoice_wise_items = {} invoice_item_row = {}
item_row_map = {}
for d in item_list: for d in item_list:
invoice_wise_items.setdefault(d.parent, []).append(d) invoice_item_row.setdefault(d.parent, []).append(d)
item_row_map.setdefault(d.parent, {}).setdefault(d.item_code, []).append(d)
tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, charge_type, base_tax_amount_after_discount_amount tax_details = frappe.db.sql("""
from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice' select
and docstatus = 1 and (account_head is not null and account_head != '') and category in ('Total', 'Valuation and Total') parent, account_head, item_wise_tax_detail, charge_type, base_tax_amount_after_discount_amount
and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)), tuple(invoice_wise_items.keys())) from `tabPurchase Taxes and Charges`
where parenttype = 'Purchase Invoice' and docstatus = 1
and (account_head is not null and account_head != '')
and category in ('Total', 'Valuation and Total')
and parent in (%s)
""" % ', '.join(['%s']*len(invoice_item_row)), tuple(invoice_item_row.keys()))
for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details: for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details:
if account_head not in tax_accounts: if account_head not in tax_accounts:
@ -107,19 +118,26 @@ def get_tax_accounts(item_list, columns):
if item_wise_tax_detail: if item_wise_tax_detail:
try: try:
item_wise_tax_detail = json.loads(item_wise_tax_detail) 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] = \ for item_code, tax_amount in item_wise_tax_detail.items():
flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount) tax_amount = flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount)
item_net_amount = sum([flt(d.base_net_amount)
for d in item_row_map.get(parent, {}).get(item_code, [])])
for d in item_row_map.get(parent, {}).get(item_code, []):
item_row_tax.setdefault(d.name, {})[account_head] = \
flt((tax_amount * d.base_net_amount) / item_net_amount)
except ValueError: except ValueError:
continue continue
elif charge_type == "Actual" and tax_amount: elif charge_type == "Actual" and tax_amount:
for d in invoice_wise_items.get(parent, []): for d in invoice_item_row.get(parent, []):
item_tax.setdefault(parent, {}).setdefault(d.item_code, {})[account_head] = \ item_row_tax.setdefault(d.name, {})[account_head] = \
(tax_amount * d.base_net_amount) / d.base_net_total flt((tax_amount * d.base_net_amount) / d.base_net_total)
tax_accounts.sort() tax_accounts.sort()
columns += [account_head + ":Currency/currency:80" for account_head in tax_accounts] columns += [account_head + ":Currency/currency:80" for account_head in tax_accounts]
columns += ["Total Tax:Currency/currency:80", "Total:Currency/currency:80"] columns += ["Total Tax:Currency/currency:80", "Total:Currency/currency:80"]
return item_tax, tax_accounts return item_row_tax, tax_accounts

63
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@ -13,7 +13,7 @@ def execute(filters=None):
item_list = get_items(filters) item_list = get_items(filters)
if item_list: if item_list:
item_tax, tax_accounts = get_tax_accounts(item_list, columns) item_row_tax, tax_accounts = get_tax_accounts(item_list, columns)
columns.append({ columns.append({
"fieldname": "currency", "fieldname": "currency",
"label": _("Currency"), "label": _("Currency"),
@ -36,7 +36,7 @@ def execute(filters=None):
delivery_note, d.income_account, d.qty, d.base_net_rate, d.base_net_amount] delivery_note, d.income_account, d.qty, d.base_net_rate, d.base_net_amount]
for tax in tax_accounts: for tax in tax_accounts:
row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0)) row.append(item_row_tax.get(d.name, {}).get(tax, 0))
total_tax = sum(row[last_col:]) total_tax = sum(row[last_col:])
row += [total_tax, d.base_net_amount + total_tax, company_currency] row += [total_tax, d.base_net_amount + total_tax, company_currency]
@ -73,49 +73,66 @@ def get_conditions(filters):
def get_items(filters): def get_items(filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
return frappe.db.sql("""select si_item.parent, si.posting_date, si.debit_to, si.project, return frappe.db.sql("""
si.customer, si.remarks, si.territory, si.company, si.base_net_total, si_item.item_code, si_item.item_name, select
si_item.item_group, si_item.sales_order, si_item.delivery_note, si_item.income_account, si_item.name, si_item.parent, si.posting_date, si.debit_to, si.project,
si_item.qty, si_item.base_net_rate, si_item.base_net_amount, si.customer_name, si.customer, si.remarks, si.territory, si.company, si.base_net_total,
si.customer_group, si_item.so_detail 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_net_rate, si_item.base_net_amount, si.customer_name,
si.customer_group, si_item.so_detail
from `tabSales Invoice` si, `tabSales Invoice Item` si_item from `tabSales Invoice` si, `tabSales Invoice Item` si_item
where si.name = si_item.parent and si.docstatus = 1 %s 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) order by si.posting_date desc, si_item.item_code desc""" % conditions, filters, as_dict=1)
def get_tax_accounts(item_list, columns): def get_tax_accounts(item_list, columns):
import json import json
item_tax = {} item_row_tax = {}
tax_accounts = [] tax_accounts = []
invoice_wise_items = {} invoice_item_row = {}
item_row_map = {}
for d in item_list: for d in item_list:
invoice_wise_items.setdefault(d.parent, []).append(d) invoice_item_row.setdefault(d.parent, []).append(d)
item_row_map.setdefault(d.parent, {}).setdefault(d.item_code, []).append(d)
tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, tax_details = frappe.db.sql("""
charge_type, base_tax_amount_after_discount_amount select
from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice' parent, account_head, item_wise_tax_detail,
and docstatus = 1 and (account_head is not null and account_head != '') charge_type, base_tax_amount_after_discount_amount
and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)), from `tabSales Taxes and Charges`
tuple(invoice_wise_items.keys())) where
parenttype = 'Sales Invoice' and docstatus = 1
and (account_head is not null and account_head != '')
and parent in (%s)
""" % ', '.join(['%s']*len(invoice_item_row)), tuple(invoice_item_row.keys()))
for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details: for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details:
if account_head not in tax_accounts: if account_head not in tax_accounts:
tax_accounts.append(account_head) tax_accounts.append(account_head)
if item_wise_tax_detail: if item_wise_tax_detail:
try: try:
item_wise_tax_detail = json.loads(item_wise_tax_detail) 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] = \ for item_code, tax_amount in item_wise_tax_detail.items():
flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount) tax_amount = flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount)
item_net_amount = sum([flt(d.base_net_amount)
for d in item_row_map.get(parent, {}).get(item_code, [])])
for d in item_row_map.get(parent, {}).get(item_code, []):
item_row_tax.setdefault(d.name, {})[account_head] = \
flt((tax_amount * d.base_net_amount) / item_net_amount)
except ValueError: except ValueError:
continue continue
elif charge_type == "Actual" and tax_amount: elif charge_type == "Actual" and tax_amount:
for d in invoice_wise_items.get(parent, []): for d in invoice_item_row.get(parent, []):
item_tax.setdefault(parent, {}).setdefault(d.item_code, {})[account_head] = \ item_row_tax.setdefault(d.name, {})[account_head] = \
flt((tax_amount * d.base_net_amount) / d.base_net_total) flt((tax_amount * d.base_net_amount) / d.base_net_total)
tax_accounts.sort() tax_accounts.sort()
columns += [account_head + ":Currency/currency:80" for account_head in tax_accounts] columns += [account_head + ":Currency/currency:80" for account_head in tax_accounts]
columns += ["Total Tax:Currency/currency:80", "Total:Currency/currency:80"] columns += ["Total Tax:Currency/currency:80", "Total:Currency/currency:80"]
return item_tax, tax_accounts return item_row_tax, tax_accounts

36
erpnext/accounts/report/purchase_register/purchase_register.py
View File

@ -119,16 +119,22 @@ def get_conditions(filters):
def get_invoices(filters): def get_invoices(filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
return frappe.db.sql("""select name, posting_date, credit_to, supplier, supplier_name, return frappe.db.sql("""
bill_no, bill_date, remarks, base_net_total, base_grand_total, outstanding_amount select
from `tabPurchase Invoice` where docstatus = 1 %s name, posting_date, credit_to, supplier, supplier_name,
bill_no, bill_date, remarks, base_net_total, base_grand_total, outstanding_amount
from `tabPurchase Invoice`
where docstatus = 1 %s
order by posting_date desc, name desc""" % conditions, filters, as_dict=1) order by posting_date desc, name desc""" % conditions, filters, as_dict=1)
def get_invoice_expense_map(invoice_list): def get_invoice_expense_map(invoice_list):
expense_details = frappe.db.sql("""select parent, expense_account, sum(base_net_amount) as amount expense_details = frappe.db.sql("""
from `tabPurchase Invoice Item` where parent in (%s) group by parent, expense_account""" % select parent, expense_account, sum(base_net_amount) as amount
', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1) from `tabPurchase Invoice Item`
where parent in (%s)
group by parent, expense_account
""" % ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
invoice_expense_map = {} invoice_expense_map = {}
for d in expense_details: for d in expense_details:
@ -138,9 +144,12 @@ def get_invoice_expense_map(invoice_list):
return invoice_expense_map return invoice_expense_map
def get_invoice_tax_map(invoice_list, invoice_expense_map, expense_accounts): def get_invoice_tax_map(invoice_list, invoice_expense_map, expense_accounts):
tax_details = frappe.db.sql("""select parent, account_head, sum(base_tax_amount_after_discount_amount) as tax_amount tax_details = frappe.db.sql("""
from `tabPurchase Taxes and Charges` where parent in (%s) group by parent, account_head""" % select parent, account_head, sum(base_tax_amount_after_discount_amount) as tax_amount
', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1) from `tabPurchase Taxes and Charges`
where parent in (%s) and category in ('Total', 'Valuation and Total')
group by parent, account_head
""" % ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
invoice_tax_map = {} invoice_tax_map = {}
for d in tax_details: for d in tax_details:
@ -156,10 +165,11 @@ def get_invoice_tax_map(invoice_list, invoice_expense_map, expense_accounts):
return invoice_expense_map, invoice_tax_map return invoice_expense_map, invoice_tax_map
def get_invoice_po_pr_map(invoice_list): def get_invoice_po_pr_map(invoice_list):
pi_items = frappe.db.sql("""select parent, purchase_order, purchase_receipt, po_detail, pi_items = frappe.db.sql("""
project from `tabPurchase Invoice Item` where parent in (%s) select parent, purchase_order, purchase_receipt, po_detail, project
and (ifnull(purchase_order, '') != '' or ifnull(purchase_receipt, '') != '')""" % from `tabPurchase Invoice Item`
', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1) where parent in (%s) and (ifnull(purchase_order, '') != '' or ifnull(purchase_receipt, '') != '')
""" % ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
invoice_po_pr_map = {} invoice_po_pr_map = {}
for d in pi_items: for d in pi_items:

16
erpnext/stock/doctype/item/item.py
View File

@ -463,9 +463,22 @@ class Item(WebsiteGenerator):
clear_cache(self.page_name) clear_cache(self.page_name)
frappe.db.set_value("Item", newdn, "item_code", newdn) frappe.db.set_value("Item", newdn, "item_code", newdn)
if merge: if merge:
self.set_last_purchase_rate(newdn) self.set_last_purchase_rate(newdn)
self.recalculate_bin_qty(newdn) self.recalculate_bin_qty(newdn)
for dt in ("Sales Taxes and Charges", "Purchase Taxes and Charges"):
for d in frappe.db.sql("""select name, item_wise_tax_detail from `tab{0}`
where ifnull(item_wise_tax_detail, '') != ''""".format(dt), as_dict=1):
item_wise_tax_detail = json.loads(d.item_wise_tax_detail)
if olddn in item_wise_tax_detail:
item_wise_tax_detail[newdn] = item_wise_tax_detail[olddn]
item_wise_tax_detail.pop(olddn)
frappe.db.set_value(dt, d.name, "item_wise_tax_detail",
json.dumps(item_wise_tax_detail), update_modified=False)
def set_last_purchase_rate(self, newdn): def set_last_purchase_rate(self, newdn):
last_purchase_rate = get_last_purchase_details(newdn).get("base_rate", 0) last_purchase_rate = get_last_purchase_details(newdn).get("base_rate", 0)
@ -562,7 +575,8 @@ class Item(WebsiteGenerator):
variant = get_variant(self.variant_of, args, self.name) variant = get_variant(self.variant_of, args, self.name)
if variant: if variant:
frappe.throw(_("Item variant {0} exists with same attributes") frappe.throw(_("Item variant {0} exists with same attributes")
.format(variant), ItemVariantExistsError) .format(variant), ItemVariantExistsError)
def validate_end_of_life(item_code, end_of_life=None, disabled=None, verbose=1): def validate_end_of_life(item_code, end_of_life=None, disabled=None, verbose=1):
if (not end_of_life) or (disabled is None): if (not end_of_life) or (disabled is None):