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

[Fix] 'To Bill' status even if the amount is zero (#14784)

Browse Source 
* Fix 'To Bill' status even if the invoice amount is zero

* Modify fix to only apply on Delivery Note documents
This commit is contained in:
Alchez 2018-09-06 18:27:06 +05:30 committed by Nabin Hait
parent a2a6568b7e
commit e52ae4eacb
5 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/controllers/status_updater.py
View File

@ -129,7 +129,7 @@ class StatusUpdater(Document):
self.status = s[0] self.status = s[0]
break break
elif s[1].startswith("eval:"): elif s[1].startswith("eval:"):
if frappe.safe_eval(s[1][5:], None, { "self": self.as_dict(), "getdate": getdate, if frappe.safe_eval(s[1][5:], None, { "self": self.as_dict(), "getdate": getdate,
"nowdate": nowdate, "get_value": frappe.db.get_value }): "nowdate": nowdate, "get_value": frappe.db.get_value }):
self.status = s[0] self.status = s[0]
break break
@ -256,7 +256,7 @@ class StatusUpdater(Document):
if args['detail_id']: if args['detail_id']:
if not args.get("extra_cond"): args["extra_cond"] = "" if not args.get("extra_cond"): args["extra_cond"] = ""
frappe.db.sql("""update `tab%(target_dt)s` frappe.db.sql("""update `tab%(target_dt)s`
set %(target_field)s = ( set %(target_field)s = (
(select ifnull(sum(%(source_field)s), 0) (select ifnull(sum(%(source_field)s), 0)
@ -281,7 +281,7 @@ class StatusUpdater(Document):
"""Update percent field in parent transaction""" """Update percent field in parent transaction"""
self._update_modified(args, update_modified) self._update_modified(args, update_modified)
if args.get('target_parent_field'): if args.get('target_parent_field'):
frappe.db.sql("""update `tab%(target_parent_dt)s` frappe.db.sql("""update `tab%(target_parent_dt)s`
set %(target_parent_field)s = round( set %(target_parent_field)s = round(
@ -335,8 +335,7 @@ class StatusUpdater(Document):
from `tab%s Item` where %s=%s and docstatus=1""" % from `tab%s Item` where %s=%s and docstatus=1""" %
(self.doctype, ref_fieldname, '%s'), (ref_dn))[0][0]) (self.doctype, ref_fieldname, '%s'), (ref_dn))[0][0])
per_billed = ((ref_doc_qty if billed_qty > ref_doc_qty else billed_qty)\ per_billed = (min(ref_doc_qty, billed_qty) / ref_doc_qty) * 100
/ ref_doc_qty)*100
ref_doc = frappe.get_doc(ref_dt, ref_dn) ref_doc = frappe.get_doc(ref_dt, ref_dn)

23
erpnext/selling/doctype/sales_order/sales_order_list.js
View File

@ -1,20 +1,25 @@
frappe.listview_settings['Sales Order'] = { frappe.listview_settings['Sales Order'] = {
add_fields: ["base_grand_total", "customer_name", "currency", "delivery_date", add_fields: ["base_grand_total", "customer_name", "currency", "delivery_date",
"per_delivered", "per_billed", "status", "order_type", "name"], "per_delivered", "per_billed", "status", "order_type", "name"],
get_indicator: function(doc) { get_indicator: function (doc) {
if(doc.status==="Closed"){ if (doc.status === "Closed") {
return [__("Closed"), "green", "status,=,Closed"]; return [__("Closed"), "green", "status,=,Closed"];
} else if (doc.order_type !== "Maintenance" } else if (doc.order_type !== "Maintenance"
&& flt(doc.per_delivered, 6) < 100 && frappe.datetime.get_diff(doc.delivery_date) < 0) { && flt(doc.per_delivered, 6) < 100 && frappe.datetime.get_diff(doc.delivery_date) < 0) {
// to bill & overdue // not delivered & overdue
return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Closed"]; return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Closed"];
} else if (doc.order_type !== "Maintenance" } else if (doc.order_type !== "Maintenance"
&& flt(doc.per_delivered, 6) < 100 && doc.status!=="Closed") { && flt(doc.per_delivered, 6) < 100 && doc.status !== "Closed") {
// not delivered // not delivered
if(flt(doc.per_billed, 6) < 100) { if (flt(doc.grand_total) === 0) {
// not delivered (zero-amount order)
return [__("To Deliver"), "orange",
"per_delivered,<,100|grand_total,=,0|status,!=,Closed"];
} else if (flt(doc.per_billed, 6) < 100) {
// not delivered & not billed // not delivered & not billed
return [__("To Deliver and Bill"), "orange", return [__("To Deliver and Bill"), "orange",
@ -27,13 +32,13 @@ frappe.listview_settings['Sales Order'] = {
} }
} else if ((doc.order_type === "Maintenance" || flt(doc.per_delivered, 6) == 100) } else if ((doc.order_type === "Maintenance" || flt(doc.per_delivered, 6) == 100)
&& flt(doc.per_billed, 6) < 100 && doc.status!=="Closed") { && flt(doc.grand_total) !== 0 && flt(doc.per_billed, 6) < 100 && doc.status !== "Closed") {
// to bill // to bill
return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Closed"]; return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Closed"];
} else if((doc.order_type === "Maintenance" || flt(doc.per_delivered, 6) == 100) } else if ((doc.order_type === "Maintenance" || flt(doc.per_delivered, 6) == 100)
&& flt(doc.per_billed, 6) == 100 && doc.status!=="Closed") { && (flt(doc.grand_total) === 0 || flt(doc.per_billed, 6) == 100) && doc.status !== "Closed") {
return [__("Completed"), "green", "per_delivered,=,100|per_billed,=,100|status,!=,Closed"]; return [__("Completed"), "green", "per_delivered,=,100|per_billed,=,100|status,!=,Closed"];
} }

5
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@ -311,8 +311,7 @@ class DeliveryNote(SellingController):
for dn in set(updated_delivery_notes): for dn in set(updated_delivery_notes):
dn_doc = self if (dn == self.name) else frappe.get_doc("Delivery Note", dn) dn_doc = self if (dn == self.name) else frappe.get_doc("Delivery Note", dn)
if dn_doc.net_total > 0: dn_doc.update_billing_percentage(update_modified=update_modified)
dn_doc.update_billing_percentage(update_modified=update_modified)
self.load_from_db() self.load_from_db()
@ -400,7 +399,7 @@ def make_sales_invoice(source_name, target_doc=None):
# set company address # set company address
target.update(get_company_address(target.company)) target.update(get_company_address(target.company))
if target.company_address: if target.company_address:
target.update(get_fetch_values("Sales Invoice", 'company_address', target.company_address)) target.update(get_fetch_values("Sales Invoice", 'company_address', target.company_address))
def update_item(source_doc, target_doc, source_parent): def update_item(source_doc, target_doc, source_parent):
target_doc.qty = source_doc.qty - invoiced_qty_map.get(source_doc.name, 0) target_doc.qty = source_doc.qty - invoiced_qty_map.get(source_doc.name, 0)

13
erpnext/stock/doctype/delivery_note/delivery_note_list.js
View File

@ -1,14 +1,13 @@
frappe.listview_settings['Delivery Note'] = { frappe.listview_settings['Delivery Note'] = {
add_fields: ["customer", "customer_name", "base_grand_total", "per_installed", "per_billed", add_fields: ["grand_total", "is_return", "per_billed", "status"],
"transporter_name", "grand_total", "is_return", "status"], get_indicator: function (doc) {
get_indicator: function(doc) { if (cint(doc.is_return) == 1) {
if(cint(doc.is_return)==1) {
return [__("Return"), "darkgrey", "is_return,=,Yes"]; return [__("Return"), "darkgrey", "is_return,=,Yes"];
} else if(doc.status==="Closed") { } else if (doc.status === "Closed") {
return [__("Closed"), "green", "status,=,Closed"]; return [__("Closed"), "green", "status,=,Closed"];
} else if (flt(doc.per_billed, 2) < 100) { } else if (doc.grand_total !== 0 && flt(doc.per_billed, 2) < 100) {
return [__("To Bill"), "orange", "per_billed,<,100"]; return [__("To Bill"), "orange", "per_billed,<,100"];
} else if (flt(doc.per_billed, 2) == 100) { } else if (doc.grand_total === 0 || flt(doc.per_billed, 2) == 100) {
return [__("Completed"), "green", "per_billed,=,100"]; return [__("Completed"), "green", "per_billed,=,100"];
} }
} }

13
erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js
View File

@ -1,14 +1,13 @@
frappe.listview_settings['Purchase Receipt'] = { frappe.listview_settings['Purchase Receipt'] = {
add_fields: ["supplier", "supplier_name", "base_grand_total", "is_subcontracted", add_fields: ["is_return", "grand_total", "status", "per_billed"],
"transporter_name", "is_return", "status", "per_billed"], get_indicator: function (doc) {
get_indicator: function(doc) { if (cint(doc.is_return) == 1) {
if(cint(doc.is_return)==1) {
return [__("Return"), "darkgrey", "is_return,=,Yes"]; return [__("Return"), "darkgrey", "is_return,=,Yes"];
} else if(doc.status==="Closed") { } else if (doc.status === "Closed") {
return [__("Closed"), "green", "status,=,Closed"]; return [__("Closed"), "green", "status,=,Closed"];
} else if (flt(doc.per_billed, 2) < 100) { } else if (flt(doc.grand_total) !== 0 && flt(doc.per_billed, 2) < 100) {
return [__("To Bill"), "orange", "per_billed,<,100"]; return [__("To Bill"), "orange", "per_billed,<,100"];
} else if (flt(doc.per_billed, 2) == 100) { } else if (flt(doc.grand_total) === 0 || flt(doc.per_billed, 2) == 100) {
return [__("Completed"), "green", "per_billed,=,100"]; return [__("Completed"), "green", "per_billed,=,100"];
} }
} }