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

Merge branch 'master' into staging-fixes

Browse Source
This commit is contained in:
Ameya Shenoy 2018-10-17 09:39:31 +00:00
commit 77b60928bf
No known key found for this signature in database
GPG Key ID: AC016A555657D0A3
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.59' __version__ = '10.1.60'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

8
erpnext/accounts/report/accounts_receivable/accounts_receivable.html
View File

@ -189,15 +189,15 @@
{% } %} {% } %}
<td><b>{%= __("Total") %}</b></td> <td><b>{%= __("Total") %}</b></td>
<td style="text-align: right"> <td style="text-align: right">
{%= format_currency(data[i]["Invoiced Amount"], data[i]["currency"] ) %}</td> {%= format_currency(data[i]["invoiced_amount"], data[i]["currency"] ) %}</td>
{% if(!filters.show_pdc_in_print) { %} {% if(!filters.show_pdc_in_print) { %}
<td style="text-align: right"> <td style="text-align: right">
{%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %}</td> {%= format_currency(data[i]["paid_amount"], data[i]["currency"]) %}</td>
<td style="text-align: right">{%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"]) %} </td> <td style="text-align: right">{%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["credit_note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"]) %} </td>
{% } %} {% } %}
<td style="text-align: right"> <td style="text-align: right">
{%= format_currency(data[i]["Outstanding Amount"], data[i]["currency"]) %}</td> {%= format_currency(data[i]["outstanding_amount"], data[i]["currency"]) %}</td>
{% if(filters.show_pdc_in_print) { %} {% if(filters.show_pdc_in_print) { %}
{% if(report.report_name === "Accounts Receivable") { %} {% if(report.report_name === "Accounts Receivable") { %}

3
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -368,7 +368,8 @@ class BOM(WebsiteGenerator):
bom_list = self.traverse_tree(bom_list) bom_list = self.traverse_tree(bom_list)
for bom in bom_list: for bom in bom_list:
bom_obj = frappe.get_doc("BOM", bom) bom_obj = frappe.get_doc("BOM", bom)
bom_obj.on_update() bom_obj.check_recursion()
bom_obj.update_exploded_items()
return bom_list return bom_list

2
erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
View File

@ -62,7 +62,7 @@ class BOMUpdateTool(Document):
bom_list.append(d[0]) bom_list.append(d[0])
self.get_parent_boms(d[0], bom_list) self.get_parent_boms(d[0], bom_list)
return bom_list return list(set(bom_list))
@frappe.whitelist() @frappe.whitelist()
def enqueue_replace_bom(args): def enqueue_replace_bom(args):

3
erpnext/stock/doctype/delivery_note/delivery_note.js
View File

@ -272,7 +272,6 @@ erpnext.stock.delivery_note.set_print_hide = function(doc, cdt, cdn){
var dn_item_fields = frappe.meta.docfield_map['Delivery Note Item']; var dn_item_fields = frappe.meta.docfield_map['Delivery Note Item'];
var dn_fields_copy = dn_fields; var dn_fields_copy = dn_fields;
var dn_item_fields_copy = dn_item_fields; var dn_item_fields_copy = dn_item_fields;
if (doc.print_without_amount) { if (doc.print_without_amount) {
dn_fields['currency'].print_hide = 1; dn_fields['currency'].print_hide = 1;
dn_item_fields['rate'].print_hide = 1; dn_item_fields['rate'].print_hide = 1;
@ -289,7 +288,7 @@ erpnext.stock.delivery_note.set_print_hide = function(doc, cdt, cdn){
if (dn_item_fields_copy['amount'].print_hide != 1) if (dn_item_fields_copy['amount'].print_hide != 1)
dn_item_fields['amount'].print_hide = 0; dn_item_fields['amount'].print_hide = 0;
if (dn_item_fields_copy['discount_amount'].print_hide != 1) if (dn_item_fields_copy['discount_amount'].print_hide != 1)
dn_item_fields['discount_amount'].print_hide = 0 dn_item_fields['discount_amount'].print_hide = 0;
if (dn_fields_copy['taxes'].print_hide != 1) if (dn_fields_copy['taxes'].print_hide != 1)
dn_fields['taxes'].print_hide = 0; dn_fields['taxes'].print_hide = 0;
} }