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

[fixes] print_hide on stock uom and gross profit

Browse Source
This commit is contained in:
Rushabh Mehta 2015-04-13 15:31:24 +05:30
parent 39c84fe31c
commit 20bcf6aeff
3 changed files with 51 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
erpnext/accounts/report/gross_profit/gross_profit.py
View File

@ -4,7 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe import _, scrub from frappe import _, scrub
from frappe.utils import flt, cstr, cint from frappe.utils import flt
def execute(filters=None): def execute(filters=None):
if not filters: filters = {} if not filters: filters = {}
@ -82,6 +82,7 @@ def get_columns(group_wise_columns, filters):
class GrossProfitGenerator(object): class GrossProfitGenerator(object):
def __init__(self, filters=None): def __init__(self, filters=None):
self.data = [] self.data = []
self.average_buying_rate = {}
self.filters = frappe._dict(filters) self.filters = frappe._dict(filters)
self.load_invoice_items() self.load_invoice_items()
self.load_stock_ledger_entries() self.load_stock_ledger_entries()
@ -95,7 +96,7 @@ class GrossProfitGenerator(object):
if self.skip_row(row, self.sales_boms): if self.skip_row(row, self.sales_boms):
continue continue
row.selling_amount = flt(row.base_net_amount) row.base_amount = flt(row.base_net_amount)
sales_boms = self.sales_boms.get(row.parenttype, {}).get(row.name, frappe._dict()) sales_boms = self.sales_boms.get(row.parenttype, {}).get(row.name, frappe._dict())
@ -107,14 +108,15 @@ class GrossProfitGenerator(object):
# get buying rate # get buying rate
if row.qty: if row.qty:
row.buying_rate = (row.buying_amount / row.qty) * 100.0 row.buying_rate = row.buying_amount / row.qty
row.base_rate = row.base_amount / row.qty
else: else:
row.buying_rate = 0.0 row.buying_rate, row.base_rate = 0.0, 0.0
# calculate gross profit # calculate gross profit
row.gross_profit = row.selling_amount - row.buying_amount row.gross_profit = row.base_amount - row.buying_amount
if row.selling_amount: if row.base_amount:
row.gross_profit_percent = (row.gross_profit / row.selling_amount) * 100.0 row.gross_profit_percent = (row.gross_profit / row.base_amount) * 100.0
else: else:
row.gross_profit_percent = 0.0 row.gross_profit_percent = 0.0
@ -139,26 +141,19 @@ class GrossProfitGenerator(object):
else: else:
new_row.qty += row.qty new_row.qty += row.qty
new_row.buying_amount += row.buying_amount new_row.buying_amount += row.buying_amount
new_row.selling_amount += row.selling_amount new_row.base_amount += row.base_amount
# new_row.allocated_amount += (row.allocated_amount or 0) if new_row.allocated_amount else 0 # new_row.allocated_amount += (row.allocated_amount or 0) if new_row.allocated_amount else 0
new_row.gross_profit = new_row.selling_amount - new_row.buying_amount new_row.gross_profit = new_row.base_amount - new_row.buying_amount
new_row.gross_profit_percent = ((new_row.gross_profit / new_row.selling_amount) * 100.0) \ new_row.gross_profit_percent = ((new_row.gross_profit / new_row.base_amount) * 100.0) \
if new_row.selling_amount else 0 if new_row.base_amount else 0
new_row.buying_rate = ((new_row.buying_amount / new_row.qty) * 100.0) \ new_row.buying_rate = (new_row.buying_amount / new_row.qty) \
if new_row.qty else 0 if new_row.qty else 0
self.grouped_data.append(new_row) self.grouped_data.append(new_row)
def skip_row(self, row, sales_boms): def skip_row(self, row, sales_boms):
if cint(row.update_stock) == 0 and not row.dn_detail: if self.filters.get("group_by") != "Invoice" and not row.get(scrub(self.filters.get("group_by"))):
if row.item_code not in self.non_stock_items:
return True
elif row.item_code in sales_boms:
for child_item in sales_boms[row.item_code]:
if child_item not in self.non_stock_items:
return True
elif self.filters.get("group_by") != "Invoice" and not row.get(scrub(self.filters.get("group_by"))):
return True return True
def get_buying_amount_from_sales_bom(self, row, sales_bom): def get_buying_amount_from_sales_bom(self, row, sales_bom):
@ -175,28 +170,42 @@ class GrossProfitGenerator(object):
# sorted by posting_date desc, posting_time desc # sorted by posting_date desc, posting_time desc
if item_code in self.non_stock_items: if item_code in self.non_stock_items:
# average purchasing rate for non-stock items # average purchasing rate for non-stock items
item_rate = frappe.db.sql("""select sum(base_net_amount) / sum(qty) item_rate = self.get_average_buying_rate(item_code)
from `tabPurchase Invoice Item` return flt(row.qty) * item_rate
where item_code = %s and docstatus=1""", item_code)
return flt(row.qty) * (flt(item_rate[0][0]) if item_rate else 0)
else: else:
if row.dn_detail: if row.dn_detail:
row.parenttype = "Delivery Note" row.parenttype = "Delivery Note"
row.parent = row.delivery_note row.parent = row.delivery_note
row.name = row.dn_detail row.name = row.dn_detail
my_sle = self.sle.get((item_code, row.warehouse))
for i, sle in enumerate(my_sle): my_sle = self.sle.get((item_code, row.warehouse))
# find the stock valution rate from stock ledger entry for i, sle in enumerate(my_sle):
if sle.voucher_type == row.parenttype and row.parent == sle.voucher_no and \ # find the stock valution rate from stock ledger entry
sle.voucher_detail_no == row.name: if sle.voucher_type == row.parenttype and row.parent == sle.voucher_no and \
previous_stock_value = len(my_sle) > i+1 and \ sle.voucher_detail_no == row.name:
flt(my_sle[i+1].stock_value) or 0.0 previous_stock_value = len(my_sle) > i+1 and \
return previous_stock_value - flt(sle.stock_value) flt(my_sle[i+1].stock_value) or 0.0
return previous_stock_value - flt(sle.stock_value)
else:
return flt(row.qty) * self.get_average_buying_rate(item_code)
return 0.0 return 0.0
def get_average_buying_rate(self, item_code):
if not item_code in self.average_buying_rate:
if item_code in self.non_stock_items:
self.average_buying_rate[item_code] = flt(frappe.db.sql("""select sum(base_net_amount) / sum(qty)
from `tabPurchase Invoice Item`
where item_code = %s and docstatus=1""", item_code)[0][0])
else:
self.average_buying_rate[item_code] = flt(frappe.db.sql("""select avg(valuation_rate)
from `tabStock Ledger Entry`
where item_code = %s and ifnull(qty_after_transaction,0) > 0""", item_code)[0][0])
return self.average_buying_rate[item_code]
def load_invoice_items(self): def load_invoice_items(self):
conditions = "" conditions = ""
if self.filters.company: if self.filters.company:

14
erpnext/config/accounts.py
View File

@ -177,6 +177,12 @@ def get_data():
"doctype": "GL Entry", "doctype": "GL Entry",
"is_query_report": True, "is_query_report": True,
}, },
{
"type": "report",
"name": "Gross Profit",
"doctype": "Sales Invoice",
"is_query_report": True
},
{ {
"type": "report", "type": "report",
"name": "Accounts Receivable", "name": "Accounts Receivable",
@ -218,13 +224,7 @@ def get_data():
"name": "financial-analytics", "name": "financial-analytics",
"label": _("Financial Analytics"), "label": _("Financial Analytics"),
"icon": "icon-bar-chart", "icon": "icon-bar-chart",
}, }
{
"type": "report",
"name": "Gross Profit",
"doctype": "Sales Invoice",
"is_query_report": True
},
] ]
}, },
{ {

2
erpnext/templates/print_formats/includes/item_table_qty.html
View File

@ -1,2 +1,4 @@
{% if (doc.stock_uom and not doc.is_print_hide("stock_uom")) or (doc.uom and not doc.is_print_hide("uom")) -%}
<small class="pull-left">{{ doc.uom or doc.stock_uom }}</small> <small class="pull-left">{{ doc.uom or doc.stock_uom }}</small>
{%- endif %}
{{ doc.get_formatted("qty", doc) }} {{ doc.get_formatted("qty", doc) }}