audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP]pms_rest_api: Improvement invoice service patch compute refund invoice

Browse Source
This commit is contained in:
Darío Lodeiros
2022-11-16 20:50:29 +01:00
parent 453d95fe5c
commit 1a3d8bd0f9
1 changed files with 49 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
pms_api_rest/services/pms_invoice_service.py
View File

@@ -52,6 +52,7 @@ class PmsInvoiceService(Component):
) )
if cmd_invoice_lines: if cmd_invoice_lines:
new_vals["invoice_line_ids"] = cmd_invoice_lines new_vals["invoice_line_ids"] = cmd_invoice_lines
new_invoice = False
if new_vals: if new_vals:
# Update Invoice # Update Invoice
# When modifying an invoice, depending on the company's configuration, # When modifying an invoice, depending on the company's configuration,
@@ -60,65 +61,42 @@ class PmsInvoiceService(Component):
# with the updated data. # with the updated data.
# TODO: to create core pms correct_invoice_policy field # TODO: to create core pms correct_invoice_policy field
# if invoice.state != "draft" and company.corrective_invoice_policy == "strict": # if invoice.state != "draft" and company.corrective_invoice_policy == "strict":
if invoice.state != "draft": if invoice.state == "posted":
# invoice create refund # invoice create refund
# new invoice with new_vals new_invoice = invoice.copy()
move_reversal = ( cmd_new_invoice_lines = []
self.env["account.move.reversal"] for item in cmd_invoice_lines:
.with_context(active_model="account.move", active_ids=invoice.ids) # susbstituted in new_vals reversed invoice line id by new invoice line id
.create( if item[0] == 0:
{ cmd_new_invoice_lines.append(item)
"date": fields.Date.today(),
"reason": _("Invoice modification"),
"refund_method": "modify",
}
)
)
move_reversal.reverse_moves()
reverse_invoice = move_reversal.new_move_ids
invoice = reverse_invoice
# If change invoice by reversal, and new_vals has invoice_line_ids
# we need to mapp the new invoice lines with the new invoice
reverse_lines = []
for line in new_vals.get("invoice_line_ids", []):
origin_line = self.env["account.move.line"].browse(line[1])
sale_line_id = origin_line.sale_line_ids.id
reverse_line = reverse_invoice.invoice_line_ids.filtered(
lambda item: item.sale_line_ids.id == sale_line_id
and item.price_unit == origin_line.price_unit
and item.quantity == origin_line.quantity
)
if line[0] == 2:
reverse_lines.append((2, reverse_line[0].id))
elif line[0] == 1:
reverse_lines.append((1, reverse_line[0].id, line))
else: else:
reverse_lines.append(line) folio_line_ids = self.env["folio.sale.line"].browse(
if reverse_lines: self.env["account.move.line"]
new_vals["invoice_line_ids"] = reverse_lines .browse(item[1])
.folio_line_ids.ids
)
new_id = new_invoice.invoice_line_ids.filtered(
lambda l: l.folio_line_ids == folio_line_ids
).id
cmd_new_invoice_lines.append((item[0], new_id, item[2]))
if cmd_new_invoice_lines:
new_vals["invoice_line_ids"] = cmd_new_invoice_lines
invoice._reverse_moves(cancel=True)
# Update Journal by partner if necessary (simplified invoice -> normal invoice)
new_vals["journal_id"] = ( new_vals["journal_id"] = (
invoice.pms_property_id._get_folio_default_journal( invoice.pms_property_id._get_folio_default_journal(
new_vals.get("partner_id", invoice.partner_id.id) new_vals.get("partner_id", invoice.partner_id.id)
).id, ).id,
) )
reverse_invoice.write(new_vals) new_invoice.write(new_vals)
invoice = reverse_invoice new_invoice.sudo().action_post()
invoice.sudo().action_post()
else: else:
invoice = self._direct_move_update(invoice, new_vals) new_invoice = self._direct_move_update(invoice, new_vals)
# Update invoice lines name invoice_to_update = new_invoice or invoice
for item in pms_invoice_info.moveLines:
if item.saleLineId in invoice.invoice_line_ids.mapped(
"folio_line_ids.id"
):
invoice_line = invoice.invoice_line_ids.filtered(
lambda r: item.saleLineId in r.folio_line_ids.ids
)
invoice_line.write({"name": item.name})
if pms_invoice_info.narration is not None: if pms_invoice_info.narration is not None:
invoice.write({"narration": pms_invoice_info.narration}) invoice_to_update.write({"narration": pms_invoice_info.narration})
if invoice.state == "draft" and pms_invoice_info.state == "confirm": if invoice_to_update.state == "draft" and pms_invoice_info.state == "confirm":
invoice.action_post() invoice_to_update.action_post()
return invoice.id return invoice.id
def _direct_move_update(self, invoice, new_vals): def _direct_move_update(self, invoice, new_vals):
@@ -207,10 +185,10 @@ class PmsInvoiceService(Component):
else: else:
cmd_invoice_lines.append((2, line.id)) cmd_invoice_lines.append((2, line.id))
# Get the new lines to add in invoice # Get the new lines to add in invoice
new_invoice_lines_info = list( newInvoiceLinesInfo = list(
filter(lambda item: not item.id, pms_invoice_info.moveLines) filter(lambda item: not item.id, pms_invoice_info.moveLines)
) )
if new_invoice_lines_info: if newInvoiceLinesInfo:
partner = ( partner = (
self.env["res.partner"].browse(pms_invoice_info.partnerId) self.env["res.partner"].browse(pms_invoice_info.partnerId)
if pms_invoice_info.partnerId if pms_invoice_info.partnerId
@@ -229,18 +207,24 @@ class PmsInvoiceService(Component):
} }
) )
) )
cmd_invoice_lines.extend( new_invoice_lines = [
[ item["invoice_line_ids"]
item["invoice_line_ids"] for item in folios.get_invoice_vals_list(
for item in folios.get_invoice_vals_list( lines_to_invoice={
lines_to_invoice={ newInvoiceLinesInfo[i]
new_invoice_lines_info[i] .saleLineId: newInvoiceLinesInfo[i]
.saleLineId: new_invoice_lines_info[i] .quantity
.quantity for i in range(0, len(newInvoiceLinesInfo))
for i in range(0, len(new_invoice_lines_info)) },
}, partner_invoice_id=partner.id,
partner_invoice_id=partner.id, )
) ][0]
# Update name of new invoice lines
for item in new_invoice_lines:
item[2]["name"] = [
line.name
for line in newInvoiceLinesInfo
if line.saleLineId == item[2]["folio_line_ids"][0][2]
][0] ][0]
) cmd_invoice_lines.extend(new_invoice_lines)
return cmd_invoice_lines return cmd_invoice_lines