diff options
| -rwxr-xr-x | fixco_custom/models/sale.py | 37 | ||||
| -rw-r--r-- | fixco_custom/models/sale_advance_payment_inv.py | 39 |
2 files changed, 37 insertions, 39 deletions
diff --git a/fixco_custom/models/sale.py b/fixco_custom/models/sale.py index 24ac70a..8269fce 100755 --- a/fixco_custom/models/sale.py +++ b/fixco_custom/models/sale.py @@ -16,6 +16,43 @@ class SaleOrder(models.Model): # } # return action + def _prepare_invoice(self): + """ + Prepare the dict of values to create the new invoice for a sales order. This method may be + overridden to implement custom invoice generation (making sure to call super() to establish + a clean extension chain). + """ + self.ensure_one() + journal = self.env['account.move'].with_context(default_move_type='out_invoice')._get_default_journal() + if not journal: + raise UserError(_('Please define an accounting sales journal for the company %s (%s).') % (self.company_id.name, self.company_id.id)) + + invoice_vals = { + 'ref': self.client_order_ref or '', + 'move_type': 'out_invoice', + 'narration': self.note, + 'invoice_marketplace': self.invoice_mp, + 'currency_id': self.pricelist_id.currency_id.id, + 'campaign_id': self.campaign_id.id, + 'medium_id': self.medium_id.id, + 'source_id': self.source_id.id, + 'user_id': self.user_id.id, + 'invoice_user_id': self.user_id.id, + 'team_id': self.team_id.id, + 'partner_id': self.partner_invoice_id.id, + 'partner_shipping_id': self.partner_shipping_id.id, + 'fiscal_position_id': (self.fiscal_position_id or self.fiscal_position_id.get_fiscal_position(self.partner_invoice_id.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, + 'journal_id': journal.id, # company comes from the journal + 'invoice_origin': self.name, + 'invoice_payment_term_id': self.payment_term_id.id, + 'payment_reference': self.reference, + 'transaction_ids': [(6, 0, self.transaction_ids.ids)], + 'invoice_line_ids': [], + 'company_id': self.company_id.id, + } + return invoice_vals + def open_form_multi_create_invoices(self): return { 'name': _('Create Invoices'), diff --git a/fixco_custom/models/sale_advance_payment_inv.py b/fixco_custom/models/sale_advance_payment_inv.py index a1e719a..df60a98 100644 --- a/fixco_custom/models/sale_advance_payment_inv.py +++ b/fixco_custom/models/sale_advance_payment_inv.py @@ -5,45 +5,6 @@ from odoo.exceptions import UserError class SaleAdvancePaymentInv(models.TransientModel): _inherit = 'sale.advance.payment.inv' - def _prepare_invoice_values(self, order, name, amount, so_line): - parent_id = order.partner_id.parent_id - parent_id = parent_id if parent_id else order.partner_id - - invoice_vals = { - 'ref': order.client_order_ref, - 'move_type': 'out_invoice', - 'invoice_origin': order.name, - 'invoice_user_id': order.user_id.id, - 'narration': order.note, - 'partner_id': parent_id, - 'sale_id': order.id, - 'invoice_marketplace': order.invoice_mp, - 'fiscal_position_id': (order.fiscal_position_id or order.fiscal_position_id.get_fiscal_position(order.partner_id.id)).id, - 'partner_shipping_id': parent_id.id, - 'real_invoice_id': order.real_invoice_id.id, - 'currency_id': order.pricelist_id.currency_id.id, - 'payment_reference': order.reference, - 'invoice_payment_term_id': order.payment_term_id.id, - 'partner_bank_id': order.company_id.partner_id.bank_ids[:1].id, - 'team_id': order.team_id.id, - 'campaign_id': order.campaign_id.id, - 'medium_id': order.medium_id.id, - 'source_id': order.source_id.id, - 'invoice_line_ids': [(0, 0, { - 'name': name, - 'price_unit': amount, - 'quantity': 1.0, - 'product_id': self.product_id.id, - 'product_uom_id': so_line.product_uom.id, - 'tax_ids': [(6, 0, so_line.tax_id.ids)], - 'sale_line_ids': [(6, 0, [so_line.id])], - 'analytic_tag_ids': [(6, 0, so_line.analytic_tag_ids.ids)], - 'analytic_account_id': order.analytic_account_id.id or False, - })], - } - - return invoice_vals - def create_invoices(self): sale_orders = self.env['sale.order'].browse(self._context.get('active_ids', [])) |