audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

MIG account_invoice_margin to 12.0

Browse Source
This commit is contained in:
Jared Kipe
2019-04-08 14:39:12 -07:00
committed by Bhoomi Vaishnani
parent 164dfebfdd
commit 41c3f8f5e4
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_invoice_margin/__manifest__.py
View File

@@ -1,7 +1,7 @@
{ {
'name': 'Invoice Margin', 'name': 'Invoice Margin',
'author': 'Hibou Corp. <hello@hibou.io>', 'author': 'Hibou Corp. <hello@hibou.io>',
'version': '11.0.1.0.0', 'version': '12.0.1.0.0',
'category': 'Accounting', 'category': 'Accounting',
'sequence': 95, 'sequence': 95,
'summary': 'Invoices include margin calculation.', 'summary': 'Invoices include margin calculation.',

4
account_invoice_margin/models/account_invoice.py
View File

@@ -19,7 +19,7 @@ class AccountInvoiceLine(models.Model):
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'] = invoice_id.date if invoice_id.date else fields.Date.context_today(invoice_id)
price = frm_cur.with_context(ctx).compute(purchase_price, to_cur, round=False) price = frm_cur.with_context(ctx)._convert(purchase_price, to_cur, invoice_id.company_id, ctx['date'], round=False)
return price return price
@api.onchange('product_id', 'uom_id') @api.onchange('product_id', 'uom_id')
@@ -42,7 +42,7 @@ class AccountInvoiceLine(models.Model):
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.invoice_id.date if line.invoice_id.date else fields.Date.context_today(line.invoice_id)
from_cur = line.invoice_id.company_currency_id.with_context(date=date) from_cur = line.invoice_id.company_currency_id.with_context(date=date)
price = from_cur.compute(line.product_id.standard_price, currency, 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))

10
account_invoice_margin/tests/test_invoice_margin.py
View File

@@ -1,4 +1,6 @@
from odoo.addons.sale_margin.tests.test_sale_margin import TestSaleMargin from odoo.addons.sale_margin.tests.test_sale_margin import TestSaleMargin
from datetime import datetime
class TestInvoiceMargin(TestSaleMargin): class TestInvoiceMargin(TestSaleMargin):
@@ -10,10 +12,11 @@ class TestInvoiceMargin(TestSaleMargin):
""" Test the sale_margin module in Odoo. """ """ Test the sale_margin module in Odoo. """
# Create a sales order for product Graphics Card. # Create a sales order for product Graphics Card.
sale_order_so11 = self.SaleOrder.create({ sale_order_so11 = self.SaleOrder.create({
'date_order': datetime.today(),
'name': 'Test_SO011', 'name': 'Test_SO011',
'order_line': [ 'order_line': [
(0, 0, { (0, 0, {
'name': '[CARD] Graphics Card', 'name': '[CARD] Individual Workplace',
'purchase_price': 700.0, 'purchase_price': 700.0,
'price_unit': 1000.0, 'price_unit': 1000.0,
'product_uom': self.product_uom_id, 'product_uom': self.product_uom_id,
@@ -26,8 +29,7 @@ class TestInvoiceMargin(TestSaleMargin):
'purchase_price': 700.0, 'purchase_price': 700.0,
'product_uom_qty': 10.0, 'product_uom_qty': 10.0,
'state': 'draft', 'state': 'draft',
'product_id': self.product_id}) 'product_id': self.product_id})],
],
'partner_id': self.partner_id, 'partner_id': self.partner_id,
'partner_invoice_id': self.partner_invoice_address_id, 'partner_invoice_id': self.partner_invoice_address_id,
'partner_shipping_id': self.partner_invoice_address_id, 'partner_shipping_id': self.partner_invoice_address_id,
@@ -37,6 +39,8 @@ class TestInvoiceMargin(TestSaleMargin):
# Verify that margin field gets bind with the value. # Verify that margin field gets bind with the value.
self.assertEqual(sale_order_so11.margin, 6000.00, "Sales order margin should be 6000.00") self.assertEqual(sale_order_so11.margin, 6000.00, "Sales order margin should be 6000.00")
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.action_invoice_create()
inv = self.AccountInvoice.browse(inv_id) inv = self.AccountInvoice.browse(inv_id)