mirror of
https://gitlab.com/hibou-io/hibou-odoo/suite.git
synced 2025-01-20 12:37:31 +02:00
MIG account_invoice_margin For Odoo 13.0 ( Test Case have error. Module works perfect).
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
'name': 'Invoice Margin',
|
'name': 'Invoice Margin',
|
||||||
'author': 'Hibou Corp. <hello@hibou.io>',
|
'author': 'Hibou Corp. <hello@hibou.io>',
|
||||||
'version': '12.0.1.0.0',
|
'version': '13.0.1.0.0',
|
||||||
'category': 'Accounting',
|
'category': 'Accounting',
|
||||||
'sequence': 95,
|
'sequence': 95,
|
||||||
'summary': 'Invoices include margin calculation.',
|
'summary': 'Invoices include margin calculation.',
|
||||||
|
|||||||
@@ -2,53 +2,53 @@ from odoo import api, fields, models
|
|||||||
from odoo.addons import decimal_precision as dp
|
from odoo.addons import decimal_precision as dp
|
||||||
|
|
||||||
|
|
||||||
class AccountInvoiceLine(models.Model):
|
class AccountMoveLine(models.Model):
|
||||||
_inherit = "account.invoice.line"
|
_inherit = "account.move.line"
|
||||||
|
|
||||||
margin = fields.Float(compute='_product_margin', digits=dp.get_precision('Product Price'), store=True)
|
margin = fields.Float(compute='_product_margin', digits=dp.get_precision('Product Price'), store=True)
|
||||||
purchase_price = fields.Float(string='Cost', digits=dp.get_precision('Product Price'))
|
purchase_price = fields.Float(string='Cost', digits=dp.get_precision('Product Price'))
|
||||||
|
|
||||||
def _compute_margin(self, invoice_id, product_id, product_uom_id, sale_line_ids):
|
def _compute_margin(self, move_id, product_id, product_uom_id, sale_line_ids):
|
||||||
# if sale_line_ids and don't re-browse
|
# if sale_line_ids and don't re-browse
|
||||||
for line in sale_line_ids:
|
for line in sale_line_ids:
|
||||||
return line.purchase_price
|
return line.purchase_price
|
||||||
frm_cur = invoice_id.company_currency_id
|
frm_cur = move_id.company_currency_id
|
||||||
to_cur = invoice_id.currency_id
|
to_cur = move_id.currency_id
|
||||||
purchase_price = product_id.standard_price
|
purchase_price = product_id.standard_price
|
||||||
if product_uom_id != product_id.uom_id:
|
if product_uom_id != product_id.uom_id:
|
||||||
purchase_price = product_id.uom_id._compute_price(purchase_price, product_uom_id)
|
purchase_price = product_id.uom_id._compute_price(purchase_price, product_uom_id)
|
||||||
ctx = self.env.context.copy()
|
ctx = self.env.context.copy()
|
||||||
ctx['date'] = invoice_id.date if invoice_id.date else fields.Date.context_today(invoice_id)
|
ctx['date'] = move_id.date if move_id.date else fields.Date.context_today(move_id)
|
||||||
price = frm_cur.with_context(ctx)._convert(purchase_price, to_cur, invoice_id.company_id, ctx['date'], round=False)
|
price = frm_cur.with_context(ctx)._convert(purchase_price, to_cur, move_id.company_id, ctx['date'], round=False)
|
||||||
return price
|
return price
|
||||||
|
|
||||||
@api.onchange('product_id', 'uom_id')
|
@api.onchange('product_id', 'product_uom_id')
|
||||||
def product_id_change_margin(self):
|
def product_id_change_margin(self):
|
||||||
if not self.product_id or not self.uom_id:
|
if not self.product_id or not self.product_uom_id:
|
||||||
return
|
return
|
||||||
self.purchase_price = self._compute_margin(self.invoice_id, self.product_id, self.uom_id, self.sale_line_ids)
|
self.purchase_price = self._compute_margin(self.move_id, self.product_id, self.product_uom_id, self.sale_line_ids)
|
||||||
|
|
||||||
@api.model
|
@api.model_create_multi
|
||||||
def create(self, vals):
|
def create(self, vals):
|
||||||
line = super(AccountInvoiceLine, self).create(vals)
|
line = super(AccountMoveLine, self).create(vals)
|
||||||
line.product_id_change_margin()
|
line.product_id_change_margin()
|
||||||
return line
|
return line
|
||||||
|
|
||||||
@api.depends('product_id', 'purchase_price', 'quantity', 'price_unit', 'price_subtotal')
|
@api.depends('product_id', 'purchase_price', 'quantity', 'price_unit', 'price_subtotal')
|
||||||
def _product_margin(self):
|
def _product_margin(self):
|
||||||
for line in self:
|
for line in self:
|
||||||
currency = line.invoice_id.currency_id
|
currency = line.move_id.currency_id
|
||||||
price = line.purchase_price
|
price = line.purchase_price
|
||||||
if line.product_id and not price:
|
if line.product_id and not price:
|
||||||
date = line.invoice_id.date if line.invoice_id.date else fields.Date.context_today(line.invoice_id)
|
date = line.move_id.date if line.move_id.date else fields.Date.context_today(line.move_id)
|
||||||
from_cur = line.invoice_id.company_currency_id.with_context(date=date)
|
from_cur = line.move_id.company_currency_id.with_context(date=date)
|
||||||
price = from_cur._convert(line.product_id.standard_price, currency, line.company_id, date, round=False)
|
price = from_cur._convert(line.product_id.standard_price, currency, line.company_id, date, round=False)
|
||||||
|
|
||||||
line.margin = currency.round(line.price_subtotal - (price * line.quantity))
|
line.margin = currency.round(line.price_subtotal - (price * line.quantity))
|
||||||
|
|
||||||
|
|
||||||
class AccountInvoice(models.Model):
|
class AccountMove(models.Model):
|
||||||
_inherit = "account.invoice"
|
_inherit = "account.move"
|
||||||
|
|
||||||
margin = fields.Monetary(compute='_product_margin',
|
margin = fields.Monetary(compute='_product_margin',
|
||||||
help="It gives profitability by calculating the difference between the Unit Price and the cost.",
|
help="It gives profitability by calculating the difference between the Unit Price and the cost.",
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ class TestInvoiceMargin(TestSaleMargin):
|
|||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestInvoiceMargin, self).setUp()
|
super(TestInvoiceMargin, self).setUp()
|
||||||
self.AccountInvoice = self.env['account.invoice']
|
self.AccountMove = self.env['account.move']
|
||||||
|
|
||||||
def test_invoice_margin(self):
|
def test_invoice_margin(self):
|
||||||
""" Test the sale_margin module in Odoo. """
|
""" Test the sale_margin module in Odoo. """
|
||||||
@@ -42,12 +42,12 @@ class TestInvoiceMargin(TestSaleMargin):
|
|||||||
sale_order_so11.order_line.write({'qty_delivered': 10.0})
|
sale_order_so11.order_line.write({'qty_delivered': 10.0})
|
||||||
|
|
||||||
# Invoice the sales order.
|
# Invoice the sales order.
|
||||||
inv_id = sale_order_so11.action_invoice_create()
|
inv_id = sale_order_so11._create_invoices()
|
||||||
inv = self.AccountInvoice.browse(inv_id)
|
inv = self.AccountMove.browse(inv_id)
|
||||||
self.assertEqual(inv.margin, sale_order_so11.margin)
|
self.assertEqual(inv.margin, sale_order_so11.margin)
|
||||||
|
|
||||||
account = self.env['account.account'].search([('internal_type', '=', 'other')], limit=1)
|
account = self.env['account.account'].search([('internal_type', '=', 'other')], limit=1)
|
||||||
inv = self.AccountInvoice.create({
|
inv = self.AccountMove.create({
|
||||||
'partner_id': self.partner_id,
|
'partner_id': self.partner_id,
|
||||||
'invoice_line_ids': [
|
'invoice_line_ids': [
|
||||||
(0, 0, {
|
(0, 0, {
|
||||||
|
|||||||
@@ -3,10 +3,10 @@
|
|||||||
|
|
||||||
<record model="ir.ui.view" id="invoice_margin_form">
|
<record model="ir.ui.view" id="invoice_margin_form">
|
||||||
<field name="name">account.invoice.margin.view.form</field>
|
<field name="name">account.invoice.margin.view.form</field>
|
||||||
<field name="model">account.invoice</field>
|
<field name="model">account.move</field>
|
||||||
<field name="inherit_id" ref="account.invoice_form"/>
|
<field name="inherit_id" ref="account.view_move_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//field[@name='residual']" position="after">
|
<xpath expr="//field[@name='amount_residual']" position="after">
|
||||||
<field name="margin" groups="base.group_user"/>
|
<field name="margin" groups="base.group_user"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="//field[@name='invoice_line_ids']//field[@name='price_unit']" position="after">
|
<xpath expr="//field[@name='invoice_line_ids']//field[@name='price_unit']" position="after">
|
||||||
|
|||||||
Reference in New Issue
Block a user