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

fix: batched items in POS

Browse Source
This commit is contained in:
Ritvik Sardana 2023-08-04 16:55:30 +05:30
parent c9d5a62350
commit 510543680b
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
View File

@ -83,19 +83,17 @@ class POSInvoiceMergeLog(Document):
pos_invoice_docs = [ pos_invoice_docs = [
frappe.get_cached_doc("POS Invoice", d.pos_invoice) for d in self.pos_invoices frappe.get_cached_doc("POS Invoice", d.pos_invoice) for d in self.pos_invoices
] ]
batched_invoices = self.get_batched_invoices(pos_invoice_docs)
returns = [d for d in pos_invoice_docs if d.get("is_return") == 1] for invoice in batched_invoices:
sales = [d for d in pos_invoice_docs if d.get("is_return") == 0] sales_invoice, credit_note = "", ""
if not invoice[0].get("is_return"):
sales_invoice = self.process_merging_into_sales_invoice(invoice)
else:
credit_note = self.process_merging_into_credit_note(invoice)
sales_invoice, credit_note = "", "" self.save() # save consolidated_sales_invoice & consolidated_credit_note ref in merge log
if returns: self.update_pos_invoices(pos_invoice_docs, sales_invoice, credit_note)
credit_note = self.process_merging_into_credit_note(returns)
if sales:
sales_invoice = self.process_merging_into_sales_invoice(sales)
self.save() # save consolidated_sales_invoice & consolidated_credit_note ref in merge log
self.update_pos_invoices(pos_invoice_docs, sales_invoice, credit_note)
def on_cancel(self): def on_cancel(self):
pos_invoice_docs = [ pos_invoice_docs = [
@ -273,6 +271,21 @@ class POSInvoiceMergeLog(Document):
si.flags.ignore_validate = True si.flags.ignore_validate = True
si.cancel() si.cancel()
def get_batched_invoices(self, pos_invoice_docs):
grouped_batch = []
current_batch = []
for item in pos_invoice_docs:
if not current_batch:
current_batch.append(item)
elif current_batch[-1].get("is_return") != item.get("is_return"):
grouped_batch.append(current_batch)
current_batch = [item]
else:
current_batch.append(item)
grouped_batch.append(current_batch)
return grouped_batch
def update_item_wise_tax_detail(consolidate_tax_row, tax_row): def update_item_wise_tax_detail(consolidate_tax_row, tax_row):
consolidated_tax_detail = json.loads(consolidate_tax_row.item_wise_tax_detail) consolidated_tax_detail = json.loads(consolidate_tax_row.item_wise_tax_detail)