Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[14.0][REF] sale_stock_picking_invoicing: Allow other modules inform Fields that should not be used from Sale 'prepare' methods #1906

Merged
merged 1 commit into from
Feb 12, 2025
+60 −55
Merged

[14.0][REF] sale_stock_picking_invoicing: Allow other modules inform Fields that should not be used from Sale 'prepare' methods #1906

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 60 additions & 55 deletions sale_stock_picking_invoicing/wizards/stock_invoice_onshipping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,39 @@ def _default_has_down_payment(self):
"Has down payments", default=_default_has_down_payment, readonly=True
)

def _get_fields_not_used_from_sale(self):
"""Fields not used from Sale 'prepare' method"""
# For reference, fields get from 'prepare' method
# "ref": self.client_order_ref or ''
# "narration": self.note,
# "campaign_id": self.campaign_id.id,
# "medium_id": self.medium_id.id,
# "source_id": self.source_id.id,
# "team_id": self.team_id.id,
# "partner_shipping_id": self.partner_shipping_id.id,
# "partner_bank_id": self.company_id.partner_id.bank_ids.
# filtered(lambda bank: bank.company_id.id in
# (self.company_id.id, False))[:1].id,
# "invoice_payment_term_id": self.payment_term_id.id,
# "payment_reference": self.reference,
# "transaction_ids": [(6, 0, self.transaction_ids.ids)],

return {
"move_type",
"currency_id",
"user_id",
"invoice_user_id",
"partner_id",
"fiscal_position_id",
"journal_id", # company comes from the journal
"invoice_origin",
"invoice_line_ids",
"company_id",
# Another fields
"__last_update",
"display_name",
}

def _build_invoice_values_from_pickings(self, pickings):
invoice, values = super()._build_invoice_values_from_pickings(pickings)

Expand Down Expand Up @@ -65,40 +98,9 @@ def _build_invoice_values_from_pickings(self, pickings):
refs.add(sale_values["ref"])
narration.add(sale_values["narration"])

# Original dict from sale module, for reference:
# Fields to get:
# "ref": self.client_order_ref or ''
# "narration": self.note,
# "campaign_id": self.campaign_id.id,
# "medium_id": self.medium_id.id,
# "source_id": self.source_id.id,
# "team_id": self.team_id.id,
# "partner_shipping_id": self.partner_shipping_id.id,
# "partner_bank_id": self.company_id.partner_id.bank_ids.
# filtered(lambda bank: bank.company_id.id in
# (self.company_id.id, False))[:1].id,
# "invoice_payment_term_id": self.payment_term_id.id,
# "payment_reference": self.reference,
# "transaction_ids": [(6, 0, self.transaction_ids.ids)],

# Fields to remove
vals_to_remove = {
"move_type",
"currency_id",
"user_id",
"invoice_user_id",
"partner_id",
"fiscal_position_id",
"journal_id", # company comes from the journal
"invoice_origin",
"invoice_line_ids",
"company_id",
# Another fields
"__last_update",
"display_name",
}
sale_values_rm = {
k: sale_values[k] for k in set(sale_values) - vals_to_remove
k: sale_values[k]
for k in set(sale_values) - self._get_fields_not_used_from_sale()
}

values.update(sale_values_rm)
Expand Down Expand Up @@ -154,6 +156,28 @@ def _get_move_key(self, move):

return key

def _get_fields_not_used_from_sale_line(self):
"""Fields not used from Sale Line 'prepare' method"""
# For reference, fields get from original 'prepare' method
# "sequence": self.sequence,
# "discount": self.discount,

return {
"display_type",
"name",
"product_id",
"product_uom_id",
"quantity",
"price_unit",
"tax_ids",
"analytic_account_id",
"analytic_tag_ids",
"sale_line_ids",
# another fields
"__last_update",
"display_name",
}

def _get_invoice_line_values(self, moves, invoice_values, invoice):
values = super()._get_invoice_line_values(moves, invoice_values, invoice)
move = fields.first(moves)
Expand All @@ -171,30 +195,11 @@ def _get_invoice_line_values(self, moves, invoice_values, invoice):
if self._get_invoice_type() != "out_refund":
# Same make above, get fields informed in Sale Line dict
sale_line_values = move.sale_line_id._prepare_invoice_line()
# Original fields from sale module
# Fields do get
# "sequence": self.sequence,
# "discount": self.discount,

# Fields to remove
vals_to_remove = {
"display_type",
"name",
"product_id",
"product_uom_id",
"quantity",
"price_unit",
"tax_ids",
"analytic_account_id",
"analytic_tag_ids",
"sale_line_ids",
# another fields
"__last_update",
"display_name",
}

sale_line_values_rm = {
k: sale_line_values[k]
for k in set(sale_line_values) - vals_to_remove
for k in set(sale_line_values)
- self._get_fields_not_used_from_sale_line()
}
values.update(sale_line_values_rm)

Expand Down