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

[FIX]14.0-pms_api_rest: services and datamodels for create/update invoices

Browse Source
This commit is contained in:
braisab
2022-11-02 19:10:08 +01:00
committed by Darío Lodeiros
parent 3801bf596d
commit 82f6ab8483
5 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pms_api_rest/datamodels/pms_invoice.py
View File

@@ -5,15 +5,17 @@ from odoo.addons.datamodel.fields import NestedModel
class PmsAccountInvoiceInfo(Datamodel): class PmsAccountInvoiceInfo(Datamodel):
_name = "pms.account.info" _name = "pms.invoice.info"
id = fields.Integer(required=False, allow_none=True) id = fields.Integer(required=False, allow_none=True)
amount = fields.Float(required=False, allow_none=True) amount = fields.Float(required=False, allow_none=True)
name = fields.String(required=False, allow_none=True) name = fields.String(required=False, allow_none=True)
date = fields.String(required=False, allow_none=True) date = fields.String(required=False, allow_none=True)
paymentState = fields.String(required=False, allow_none=True) paymentState = fields.String(required=False, allow_none=True)
state = fields.String(required=False, allow_none=True) state = fields.String(required=False, allow_none=True)
# partnerName??, is not enought partnerId? # REVIEW: partnerName??, is not enought partnerId?
partnerName = fields.String(required=False, allow_none=True) partnerName = fields.String(required=False, allow_none=True)
partnerId = fields.Int(required=False, allow_none=True) partnerId = fields.Integer(required=False, allow_none=True)
moveLines = fields.List(NestedModel("pms.invoice.line.info")) moveLines = fields.List(NestedModel("pms.invoice.line.info"))
saleLines = fields.List(NestedModel("pms.folio.sale.line.info")) saleLines = fields.List(NestedModel("pms.folio.sale.line.info"))
narration = fields.String(required=False, allow_none=True)
portalUrl = fields.String(required=False, allow_none=True)

2
pms_api_rest/datamodels/pms_invoice_line.py
View File

@@ -8,5 +8,7 @@ class PmsInvoiceLineInfo(Datamodel):
id = fields.Integer(required=False, allow_none=True) id = fields.Integer(required=False, allow_none=True)
name = fields.String(required=False, allow_none=True) name = fields.String(required=False, allow_none=True)
quantity = fields.Float(required=False, allow_none=True) quantity = fields.Float(required=False, allow_none=True)
priceUnit = fields.Float(required=False, allow_none=True)
total = fields.Float(required=False, allow_none=True) total = fields.Float(required=False, allow_none=True)
displayType = fields.String(required=False, allow_none=True) displayType = fields.String(required=False, allow_none=True)
saleLineId = fields.Integer(required=False, allow_none=True)

61
pms_api_rest/services/pms_folio_service.py
View File

@@ -485,7 +485,7 @@ class PmsFolioService(Component):
"GET", "GET",
) )
], ],
output_param=Datamodel("pms.account.info", is_list=True), output_param=Datamodel("pms.invoice.info", is_list=True),
auth="jwt_api_pms", auth="jwt_api_pms",
) )
def get_folio_invoices(self, folio_id): def get_folio_invoices(self, folio_id):
@@ -494,12 +494,12 @@ class PmsFolioService(Component):
if not folio: if not folio:
pass pass
else: else:
PmsFolioInvoiceInfo = self.env.datamodels["pms.account.info"] PmsFolioInvoiceInfo = self.env.datamodels["pms.invoice.info"]
PmsInvoiceLineInfo = self.env.datamodels["pms.invoice.line.info"] PmsInvoiceLineInfo = self.env.datamodels["pms.invoice.line.info"]
if folio.move_ids: if folio.move_ids:
for move_id in folio.move_ids: for move in folio.move_ids:
move_lines = [] move_lines = []
for move_line in move_id.invoice_line_ids: for move_line in move.invoice_line_ids:
move_lines.append( move_lines.append(
PmsInvoiceLineInfo( PmsInvoiceLineInfo(
id=move_line.id, id=move_line.id,
@@ -507,6 +507,9 @@ class PmsFolioService(Component):
quantity=move_line.quantity quantity=move_line.quantity
if move_line.quantity if move_line.quantity
else None, else None,
priceUnit=move_line.price_unit
if move_line.price_unit
else None,
total=move_line.price_total total=move_line.price_total
if move_line.price_total if move_line.price_total
else None, else None,
@@ -515,24 +518,32 @@ class PmsFolioService(Component):
else None, else None,
) )
) )
portal_url = (
self.env["ir.config_parameter"].sudo().get_param("web.base.url")
+ move.get_portal_url()
)
invoices.append( invoices.append(
PmsFolioInvoiceInfo( PmsFolioInvoiceInfo(
id=move_id.id if move_id.id else None, id=move.id if move.id else None,
name=move_id.name if move_id.name else None, name=move.name if move.name else None,
amount=round(move_id.amount_total, 2) amount=round(move.amount_total, 2)
if move_id.amount_total if move.amount_total
else None, else None,
date=move_id.invoice_date.strftime("%d/%m/%Y") date=move.invoice_date.strftime("%d/%m/%Y")
if move_id.invoice_date if move.invoice_date
else None, else None,
state=move_id.state if move_id.state else None, state=move.state if move.state else None,
paymentState=move_id.payment_state paymentState=move.payment_state
if move_id.payment_state if move.payment_state
else None, else None,
partnerName=move_id.partner_id.name partnerName=move.partner_id.name
if move_id.partner_id.name if move.partner_id.name
else None,
partnerId=move.partner_id.id
if move.partner_id.id
else None, else None,
moveLines=move_lines if move_lines else None, moveLines=move_lines if move_lines else None,
portalUrl=portal_url,
) )
) )
return invoices return invoices
@@ -546,23 +557,19 @@ class PmsFolioService(Component):
"POST", "POST",
) )
], ],
input_param=Datamodel("pms.account.info", is_list=False), input_param=Datamodel("pms.invoice.info", is_list=False),
auth="jwt_api_pms", auth="jwt_api_pms",
) )
def create_folio_invoices(self, folio_id, invoice_info): def create_folio_invoices(self, folio_id, invoice_info):
# TODO: Missing payload data: # TODO: Missing payload data:
# - partnerId selected # - date format is in invoice_info but dont save
# - quantity to invoice selected # - invoice comment is in invoice_info but dont save
# - front line description modification
# - data format mal formartted
# - invoice comment
# date_invoice = fields.Date.from_string(invoice_info.date) date_invoice = fields.Date.from_string(invoice_info.date)
# if not date_invoice: if not date_invoice:
# raise MissingError(_("Date is required")) raise MissingError(_("Date is required"))
lines_to_invoice_dict = dict() lines_to_invoice_dict = dict()
for item in invoice_info.saleLines: for item in invoice_info.saleLines:
# TODO: Need get specific to_invoice front value
if item.qtyToInvoice: if item.qtyToInvoice:
lines_to_invoice_dict[item.id] = item.qtyToInvoice lines_to_invoice_dict[item.id] = item.qtyToInvoice
@@ -571,8 +578,8 @@ class PmsFolioService(Component):
) )
folios_to_invoice = sale_lines_to_invoice.folio_id folios_to_invoice = sale_lines_to_invoice.folio_id
invoices = folios_to_invoice._create_invoices( invoices = folios_to_invoice._create_invoices(
# date=date_invoice, TODO: Wrong format date from front date=date_invoice,
lines_to_invoice=lines_to_invoice_dict, lines_to_invoice=lines_to_invoice_dict,
partner_invoice_id=105165, partner_invoice_id=invoice_info.partnerId,
) )
return invoices.ids return invoices.ids

11
pms_api_rest/services/pms_invoice_service.py
View File

@@ -7,7 +7,7 @@ from odoo.addons.component.core import Component
class PmsInvoiceService(Component): class PmsInvoiceService(Component):
_inherit = "base.rest.service" _inherit = "base.rest.service"
_name = "pms.invoice" _name = "pms.invoice.service"
_usage = "invoices" _usage = "invoices"
_collection = "pms.services" _collection = "pms.services"
@@ -47,20 +47,21 @@ class PmsInvoiceService(Component):
# send to service, the lines that are not sent we assume that # send to service, the lines that are not sent we assume that
# they have been eliminated # they have been eliminated
if pms_invoice_info.moveLines and pms_invoice_info.moveLines is not None: if pms_invoice_info.moveLines and pms_invoice_info.moveLines is not None:
new_vals["reservation_line_ids"] = [] new_vals["invoice_line_ids"] = []
for line in invoice.invoice_line_ids: for line in invoice.invoice_line_ids:
line_info = [ line_info = [
item.id for item in pms_invoice_info.moveLines if item.id == line.id item for item in pms_invoice_info.moveLines if item.id == line.id
] ]
if line_info: if line_info:
line_info = line_info[0]
line_values = {} line_values = {}
if line_info.name and line_info.name != line.name: if line_info.name and line_info.name != line.name:
line_values["name"] = line_info.name line_values["name"] = line_info.name
if line_info.quantity and line_info.quantity != line.quantity: if line_info.quantity and line_info.quantity != line.quantity:
line_values["quantity"] = line_info.quantity line_values["quantity"] = line_info.quantity
new_vals["reservation_line_ids"].append((1, 4, line_values)) new_vals["invoice_line_ids"].append((1, line.id, line_values))
else: else:
new_vals["reservation_line_ids"].append((2, line.id)) new_vals["invoice_line_ids"].append((2, line.id))
if not new_vals: if not new_vals:
return invoice.id return invoice.id

4
pms_api_rest/services/pms_partner_service.py
View File

@@ -246,7 +246,7 @@ class PmsPartnerService(Component):
"GET", "GET",
) )
], ],
output_param=Datamodel("pms.account.info", is_list=True), output_param=Datamodel("pms.invoice.info", is_list=True),
auth="jwt_api_pms", auth="jwt_api_pms",
) )
def get_partner_invoices(self, partner_id): def get_partner_invoices(self, partner_id):
@@ -256,7 +256,7 @@ class PmsPartnerService(Component):
("move_type", "in", self.env["account.move"].get_invoice_types()), ("move_type", "in", self.env["account.move"].get_invoice_types()),
] ]
) )
PmsAcoountMoveInfo = self.env.datamodels["pms.account.info"] PmsAcoountMoveInfo = self.env.datamodels["pms.invoice.info"]
invoices = [] invoices = []
for invoice in partnerInvoices: for invoice in partnerInvoices:
invoices.append( invoices.append(