Merge branch 'develop' into valuation-rate
This commit is contained in:
commit
d03ebbd51d
@ -169,9 +169,11 @@ class ReceivablePayableReport(object):
|
||||
|
||||
def append_subtotal_row(self, party):
|
||||
sub_total_row = self.total_row_map.get(party)
|
||||
self.data.append(sub_total_row)
|
||||
self.data.append({})
|
||||
self.update_sub_total_row(sub_total_row, 'Total')
|
||||
|
||||
if sub_total_row:
|
||||
self.data.append(sub_total_row)
|
||||
self.data.append({})
|
||||
self.update_sub_total_row(sub_total_row, 'Total')
|
||||
|
||||
def get_voucher_balance(self, gle):
|
||||
if self.filters.get("sales_person"):
|
||||
@ -232,7 +234,8 @@ class ReceivablePayableReport(object):
|
||||
|
||||
if self.filters.get('group_by_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):
|
||||
self.allocate_future_payments(row)
|
||||
|
@ -112,13 +112,14 @@ class BOM(WebsiteGenerator):
|
||||
if self.routing:
|
||||
self.set("operations", [])
|
||||
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', {
|
||||
"operation": d.operation,
|
||||
"workstation": d.workstation,
|
||||
"description": d.description,
|
||||
"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)
|
||||
|
||||
|
@ -64,7 +64,8 @@ class ImportSupplierInvoice(Document):
|
||||
"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)
|
||||
invoices_args["destination_code"] = get_destination_code_from_file(file_content)
|
||||
|
Loading…
x
Reference in New Issue
Block a user