nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 13:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into valuation-rate

Browse Source
This commit is contained in:
Marica
2020-06-04 15:31:11 +05:30
committed by GitHub
parent 6f7e9d2904 2213ea3d82
commit d03ebbd51d
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@@ -169,9 +169,11 @@ class ReceivablePayableReport(object):
def append_subtotal_row(self, party): def append_subtotal_row(self, party):
sub_total_row = self.total_row_map.get(party) sub_total_row = self.total_row_map.get(party)
self.data.append(sub_total_row)
self.data.append({}) if sub_total_row:
self.update_sub_total_row(sub_total_row, 'Total') self.data.append(sub_total_row)
self.data.append({})
self.update_sub_total_row(sub_total_row, 'Total')
def get_voucher_balance(self, gle): def get_voucher_balance(self, gle):
if self.filters.get("sales_person"): if self.filters.get("sales_person"):
@@ -232,7 +234,8 @@ class ReceivablePayableReport(object):
if self.filters.get('group_by_party'): if self.filters.get('group_by_party'):
self.append_subtotal_row(self.previous_party) self.append_subtotal_row(self.previous_party)
self.data.append(self.total_row_map.get('Total')) if self.data:
self.data.append(self.total_row_map.get('Total'))
def append_row(self, row): def append_row(self, row):
self.allocate_future_payments(row) self.allocate_future_payments(row)

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

@@ -112,13 +112,14 @@ class BOM(WebsiteGenerator):
if self.routing: if self.routing:
self.set("operations", []) self.set("operations", [])
for d in frappe.get_all("BOM Operation", fields = ["*"], for d in frappe.get_all("BOM Operation", fields = ["*"],
filters = {'parenttype': 'Routing', 'parent': self.routing}): filters = {'parenttype': 'Routing', 'parent': self.routing}, order_by="idx"):
child = self.append('operations', { child = self.append('operations', {
"operation": d.operation, "operation": d.operation,
"workstation": d.workstation, "workstation": d.workstation,
"description": d.description, "description": d.description,
"time_in_mins": d.time_in_mins, "time_in_mins": d.time_in_mins,
"batch_size": d.batch_size "batch_size": d.batch_size,
"idx": d.idx
}) })
child.hour_rate = flt(d.hour_rate / self.conversion_rate, 2) child.hour_rate = flt(d.hour_rate / self.conversion_rate, 2)

3
erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
View File

@@ -64,7 +64,8 @@ class ImportSupplierInvoice(Document):
"buying_price_list": self.default_buying_price_list "buying_price_list": self.default_buying_price_list
} }
if not invoices_args.get("invoice_no", ''): return if not invoices_args.get("bill_no", ''):
frappe.throw(_("Numero has not set in the XML file"))
supp_dict = get_supplier_details(file_content) supp_dict = get_supplier_details(file_content)
invoices_args["destination_code"] = get_destination_code_from_file(file_content) invoices_args["destination_code"] = get_destination_code_from_file(file_content)