[IMP] : black, isort, prettier
This commit is contained in:
parent
5b9bb53fcd
commit
faf175e9f0
@ -5,16 +5,12 @@
|
|||||||
"name": "Account Move Line Sale Info",
|
"name": "Account Move Line Sale Info",
|
||||||
"summary": "Introduces the purchase order line to the journal items",
|
"summary": "Introduces the purchase order line to the journal items",
|
||||||
"version": "11.0.1.0.0",
|
"version": "11.0.1.0.0",
|
||||||
"author": "ForgeFlow S.L., "
|
"author": "ForgeFlow S.L., " "Odoo Community Association (OCA)",
|
||||||
"Odoo Community Association (OCA)",
|
|
||||||
"website": "http://www.github.com/OCA/account-financial-tools",
|
"website": "http://www.github.com/OCA/account-financial-tools",
|
||||||
"category": "Generic",
|
"category": "Generic",
|
||||||
"depends": ["account_move_line_stock_info", "sale"],
|
"depends": ["account_move_line_stock_info", "sale"],
|
||||||
"license": "AGPL-3",
|
"license": "AGPL-3",
|
||||||
"data": [
|
"data": ["security/account_security.xml", "views/account_move_view.xml",],
|
||||||
"security/account_security.xml",
|
"installable": True,
|
||||||
"views/account_move_view.xml",
|
"post_init_hook": "post_init_hook",
|
||||||
],
|
|
||||||
'installable': True,
|
|
||||||
'post_init_hook': 'post_init_hook',
|
|
||||||
}
|
}
|
||||||
|
@ -1,22 +1,26 @@
|
|||||||
# Copyright 2019 ForgeFlow S.L.
|
# Copyright 2019 ForgeFlow S.L.
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||||
import ast
|
import ast
|
||||||
from odoo import api, SUPERUSER_ID
|
|
||||||
|
from odoo import SUPERUSER_ID, api
|
||||||
|
|
||||||
|
|
||||||
def post_init_hook(cr, registry):
|
def post_init_hook(cr, registry):
|
||||||
|
|
||||||
""" INIT sale references in acount move line """
|
""" INIT sale references in acount move line """
|
||||||
# FOR stock moves
|
# FOR stock moves
|
||||||
cr.execute("""
|
cr.execute(
|
||||||
|
"""
|
||||||
update account_move_line aml set sale_line_id = sm.sale_line_id
|
update account_move_line aml set sale_line_id = sm.sale_line_id
|
||||||
FROM account_move_line aml2
|
FROM account_move_line aml2
|
||||||
INNER JOIN stock_move sm ON
|
INNER JOIN stock_move sm ON
|
||||||
aml2.stock_move_id = sm.id
|
aml2.stock_move_id = sm.id
|
||||||
WHERE aml.id = aml2.id;
|
WHERE aml.id = aml2.id;
|
||||||
""")
|
"""
|
||||||
|
)
|
||||||
# FOR invoices
|
# FOR invoices
|
||||||
cr.execute("""
|
cr.execute(
|
||||||
|
"""
|
||||||
update account_move_line aml set sale_line_id = sol.id
|
update account_move_line aml set sale_line_id = sol.id
|
||||||
FROM account_move_line aml2
|
FROM account_move_line aml2
|
||||||
INNER JOIN account_invoice ai ON
|
INNER JOIN account_invoice ai ON
|
||||||
@ -29,30 +33,36 @@ def post_init_hook(cr, registry):
|
|||||||
rel.order_line_id = sol.id
|
rel.order_line_id = sol.id
|
||||||
AND sol.product_id = aml2.product_id
|
AND sol.product_id = aml2.product_id
|
||||||
WHERE aml.id = aml2.id;
|
WHERE aml.id = aml2.id;
|
||||||
""")
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
# NOW we can fill the SO
|
# NOW we can fill the SO
|
||||||
cr.execute("""
|
cr.execute(
|
||||||
|
"""
|
||||||
UPDATE account_move_line aml
|
UPDATE account_move_line aml
|
||||||
SET sale_id = sol.order_id
|
SET sale_id = sol.order_id
|
||||||
FROM sale_order_line AS sol
|
FROM sale_order_line AS sol
|
||||||
WHERE aml.sale_line_id = sol.id
|
WHERE aml.sale_line_id = sol.id
|
||||||
RETURNING aml.move_id
|
RETURNING aml.move_id
|
||||||
""")
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
# NOW we can fill the lines without invoice_id (Odoo put it very
|
# NOW we can fill the lines without invoice_id (Odoo put it very
|
||||||
# complicated)
|
# complicated)
|
||||||
|
|
||||||
cr.execute("""
|
cr.execute(
|
||||||
|
"""
|
||||||
UPDATE account_move_line aml
|
UPDATE account_move_line aml
|
||||||
SET sale_id = so.id
|
SET sale_id = so.id
|
||||||
FROM sale_order_line so
|
FROM sale_order_line so
|
||||||
LEFT JOIN account_move_line aml2
|
LEFT JOIN account_move_line aml2
|
||||||
ON aml2.sale_id = so.id
|
ON aml2.sale_id = so.id
|
||||||
WHERE aml2.move_id = aml.move_id
|
WHERE aml2.move_id = aml.move_id
|
||||||
""")
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
cr.execute("""
|
cr.execute(
|
||||||
|
"""
|
||||||
update account_move_line aml set sale_line_id = sol.id
|
update account_move_line aml set sale_line_id = sol.id
|
||||||
FROM account_move_line aml2
|
FROM account_move_line aml2
|
||||||
INNER JOIN sale_order so ON
|
INNER JOIN sale_order so ON
|
||||||
@ -61,4 +71,5 @@ def post_init_hook(cr, registry):
|
|||||||
so.id = sol.order_id
|
so.id = sol.order_id
|
||||||
AND sol.product_id = aml2.product_id
|
AND sol.product_id = aml2.product_id
|
||||||
WHERE aml.id = aml2.id;
|
WHERE aml.id = aml2.id;
|
||||||
""")
|
"""
|
||||||
|
)
|
||||||
|
@ -6,25 +6,25 @@ from odoo import api, models
|
|||||||
|
|
||||||
class AccountInvoice(models.Model):
|
class AccountInvoice(models.Model):
|
||||||
|
|
||||||
_inherit = 'account.invoice'
|
_inherit = "account.invoice"
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def invoice_line_move_line_get(self):
|
def invoice_line_move_line_get(self):
|
||||||
res = super(AccountInvoice, self).invoice_line_move_line_get()
|
res = super(AccountInvoice, self).invoice_line_move_line_get()
|
||||||
|
|
||||||
invoice_line_model = self.env['account.invoice.line']
|
invoice_line_model = self.env["account.invoice.line"]
|
||||||
for move_line_dict in res:
|
for move_line_dict in res:
|
||||||
if 'invl_id' in move_line_dict:
|
if "invl_id" in move_line_dict:
|
||||||
line = invoice_line_model.browse(move_line_dict['invl_id'])
|
line = invoice_line_model.browse(move_line_dict["invl_id"])
|
||||||
if line.sale_line_ids and len(line.sale_line_ids) == 1:
|
if line.sale_line_ids and len(line.sale_line_ids) == 1:
|
||||||
move_line_dict['sale_line_id'] = line.sale_line_ids[0].id
|
move_line_dict["sale_line_id"] = line.sale_line_ids[0].id
|
||||||
return res
|
return res
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def line_get_convert(self, line, part):
|
def line_get_convert(self, line, part):
|
||||||
res = super(AccountInvoice, self).line_get_convert(line, part)
|
res = super(AccountInvoice, self).line_get_convert(line, part)
|
||||||
if line.get('sale_line_id', False):
|
if line.get("sale_line_id", False):
|
||||||
res['sale_line_id'] = line.get('sale_line_id')
|
res["sale_line_id"] = line.get("sale_line_id")
|
||||||
return res
|
return res
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
@ -35,5 +35,5 @@ class AccountInvoice(models.Model):
|
|||||||
res = super()._anglo_saxon_sale_move_lines(i_line)
|
res = super()._anglo_saxon_sale_move_lines(i_line)
|
||||||
for aml in res:
|
for aml in res:
|
||||||
if i_line.sale_line_ids and len(i_line.sale_line_ids) == 1:
|
if i_line.sale_line_ids and len(i_line.sale_line_ids) == 1:
|
||||||
aml['sale_line_id'] = i_line.sale_line_ids[0].id
|
aml["sale_line_id"] = i_line.sale_line_ids[0].id
|
||||||
return res
|
return res
|
||||||
|
@ -6,18 +6,20 @@ from odoo import fields, models
|
|||||||
|
|
||||||
class AccountMoveLine(models.Model):
|
class AccountMoveLine(models.Model):
|
||||||
|
|
||||||
_inherit = 'account.move.line'
|
_inherit = "account.move.line"
|
||||||
|
|
||||||
sale_line_id = fields.Many2one(
|
sale_line_id = fields.Many2one(
|
||||||
comodel_name='sale.order.line',
|
comodel_name="sale.order.line",
|
||||||
string='Sale Order Line',
|
string="Sale Order Line",
|
||||||
ondelete='set null', index=True,
|
ondelete="set null",
|
||||||
|
index=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
sale_id = fields.Many2one(
|
sale_id = fields.Many2one(
|
||||||
comodel_name='sale.order',
|
comodel_name="sale.order",
|
||||||
related='sale_line_id.order_id',
|
related="sale_line_id.order_id",
|
||||||
string='Sales Order',
|
string="Sales Order",
|
||||||
ondelete='set null',
|
ondelete="set null",
|
||||||
store=True, index=True,
|
store=True,
|
||||||
|
index=True,
|
||||||
)
|
)
|
||||||
|
@ -13,8 +13,7 @@ class SaleOrderLine(models.Model):
|
|||||||
orig_name = dict(super(SaleOrderLine, self).name_get())
|
orig_name = dict(super(SaleOrderLine, self).name_get())
|
||||||
for line in self:
|
for line in self:
|
||||||
name = orig_name[line.id]
|
name = orig_name[line.id]
|
||||||
if self.env.context.get('so_line_info', False):
|
if self.env.context.get("so_line_info", False):
|
||||||
name = "[%s] %s (%s)" % (line.order_id.name, name,
|
name = "[{}] {} ({})".format(line.order_id.name, name, line.order_id.state)
|
||||||
line.order_id.state)
|
|
||||||
result.append((line.id, name))
|
result.append((line.id, name))
|
||||||
return result
|
return result
|
||||||
|
@ -7,10 +7,12 @@ class StockMove(models.Model):
|
|||||||
_inherit = "stock.move"
|
_inherit = "stock.move"
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def _prepare_account_move_line(self, qty, cost,
|
def _prepare_account_move_line(
|
||||||
credit_account_id, debit_account_id):
|
self, qty, cost, credit_account_id, debit_account_id
|
||||||
|
):
|
||||||
res = super(StockMove, self)._prepare_account_move_line(
|
res = super(StockMove, self)._prepare_account_move_line(
|
||||||
qty, cost, credit_account_id, debit_account_id)
|
qty, cost, credit_account_id, debit_account_id
|
||||||
|
)
|
||||||
for line in res:
|
for line in res:
|
||||||
line[2]['sale_line_id'] = self.sale_line_id.id
|
line[2]["sale_line_id"] = self.sale_line_id.id
|
||||||
return res
|
return res
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<odoo>
|
<odoo>
|
||||||
|
|
||||||
<record id="group_account_move_sale_info" model="res.groups">
|
<record id="group_account_move_sale_info" model="res.groups">
|
||||||
<field name="name">Sale info in Journal Items</field>
|
<field name="name">Sale info in Journal Items</field>
|
||||||
<field name="category_id" ref="base.module_category_hidden"/>
|
<field name="category_id" ref="base.module_category_hidden" />
|
||||||
<field name="users" eval="[(4, ref('base.user_root'))]"/>
|
<field name="users" eval="[(4, ref('base.user_root'))]" />
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</odoo>
|
</odoo>
|
||||||
|
@ -1,117 +1,117 @@
|
|||||||
# Copyright 2020 ForgeFlow S.L.
|
# Copyright 2020 ForgeFlow S.L.
|
||||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||||
from odoo.tests import common
|
|
||||||
from odoo import fields
|
from odoo import fields
|
||||||
|
from odoo.tests import common
|
||||||
|
|
||||||
|
|
||||||
class TestAccountMoveLineSaleInfo(common.TransactionCase):
|
class TestAccountMoveLineSaleInfo(common.TransactionCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestAccountMoveLineSaleInfo, self).setUp()
|
super(TestAccountMoveLineSaleInfo, self).setUp()
|
||||||
self.sale_model = self.env['sale.order']
|
self.sale_model = self.env["sale.order"]
|
||||||
self.sale_line_model = self.env['sale.order.line']
|
self.sale_line_model = self.env["sale.order.line"]
|
||||||
self.invoice_model = self.env['account.invoice']
|
self.invoice_model = self.env["account.invoice"]
|
||||||
self.invoice_line_model = self.env['account.invoice.line']
|
self.invoice_line_model = self.env["account.invoice.line"]
|
||||||
self.product_model = self.env['product.product']
|
self.product_model = self.env["product.product"]
|
||||||
self.product_ctg_model = self.env['product.category']
|
self.product_ctg_model = self.env["product.category"]
|
||||||
self.acc_type_model = self.env['account.account.type']
|
self.acc_type_model = self.env["account.account.type"]
|
||||||
self.account_model = self.env['account.account']
|
self.account_model = self.env["account.account"]
|
||||||
self.aml_model = self.env['account.move.line']
|
self.aml_model = self.env["account.move.line"]
|
||||||
self.res_users_model = self.env['res.users']
|
self.res_users_model = self.env["res.users"]
|
||||||
|
|
||||||
self.partner1 = self.env.ref('base.res_partner_1')
|
self.partner1 = self.env.ref("base.res_partner_1")
|
||||||
self.location_stock = self.env.ref('stock.stock_location_stock')
|
self.location_stock = self.env.ref("stock.stock_location_stock")
|
||||||
self.company = self.env.ref('base.main_company')
|
self.company = self.env.ref("base.main_company")
|
||||||
self.group_sale_user = self.env.ref('sales_team.group_sale_salesman')
|
self.group_sale_user = self.env.ref("sales_team.group_sale_salesman")
|
||||||
self.group_account_invoice = self.env.ref(
|
self.group_account_invoice = self.env.ref("account.group_account_invoice")
|
||||||
'account.group_account_invoice')
|
self.group_account_manager = self.env.ref("account.group_account_manager")
|
||||||
self.group_account_manager = self.env.ref(
|
|
||||||
'account.group_account_manager')
|
|
||||||
|
|
||||||
# Create account for Goods Received Not Invoiced
|
# Create account for Goods Received Not Invoiced
|
||||||
acc_type = self._create_account_type('equity', 'other')
|
acc_type = self._create_account_type("equity", "other")
|
||||||
name = 'Goods Received Not Invoiced'
|
name = "Goods Received Not Invoiced"
|
||||||
code = 'grni'
|
code = "grni"
|
||||||
self.account_grni = self._create_account(acc_type, name, code,
|
self.account_grni = self._create_account(acc_type, name, code, self.company)
|
||||||
self.company)
|
|
||||||
|
|
||||||
# Create account for Cost of Goods Sold
|
# Create account for Cost of Goods Sold
|
||||||
acc_type = self._create_account_type('expense', 'other')
|
acc_type = self._create_account_type("expense", "other")
|
||||||
name = 'Cost of Goods Sold'
|
name = "Cost of Goods Sold"
|
||||||
code = 'cogs'
|
code = "cogs"
|
||||||
self.account_cogs = self._create_account(acc_type, name, code,
|
self.account_cogs = self._create_account(acc_type, name, code, self.company)
|
||||||
self.company)
|
|
||||||
# Create account for Inventory
|
# Create account for Inventory
|
||||||
acc_type = self._create_account_type('asset', 'other')
|
acc_type = self._create_account_type("asset", "other")
|
||||||
name = 'Inventory'
|
name = "Inventory"
|
||||||
code = 'inventory'
|
code = "inventory"
|
||||||
self.account_inventory = self._create_account(acc_type, name, code,
|
self.account_inventory = self._create_account(
|
||||||
self.company)
|
acc_type, name, code, self.company
|
||||||
|
)
|
||||||
# Create Product
|
# Create Product
|
||||||
self.product = self._create_product()
|
self.product = self._create_product()
|
||||||
|
|
||||||
# Create users
|
# Create users
|
||||||
self.sale_user = self._create_user('sale_user',
|
self.sale_user = self._create_user(
|
||||||
[self.group_sale_user,
|
"sale_user",
|
||||||
self.group_account_invoice],
|
[self.group_sale_user, self.group_account_invoice],
|
||||||
self.company)
|
self.company,
|
||||||
self.account_invoice = self._create_user('account_invoice',
|
)
|
||||||
[self.group_account_invoice],
|
self.account_invoice = self._create_user(
|
||||||
self.company)
|
"account_invoice", [self.group_account_invoice], self.company
|
||||||
self.account_manager = self._create_user('account_manager',
|
)
|
||||||
[self.group_account_manager],
|
self.account_manager = self._create_user(
|
||||||
self.company)
|
"account_manager", [self.group_account_manager], self.company
|
||||||
|
)
|
||||||
|
|
||||||
def _create_user(self, login, groups, company):
|
def _create_user(self, login, groups, company):
|
||||||
""" Create a user."""
|
""" Create a user."""
|
||||||
group_ids = [group.id for group in groups]
|
group_ids = [group.id for group in groups]
|
||||||
user = \
|
user = self.res_users_model.with_context({"no_reset_password": True}).create(
|
||||||
self.res_users_model.with_context(
|
{
|
||||||
{'no_reset_password': True}).create({
|
"name": "Test User",
|
||||||
'name': 'Test User',
|
"login": login,
|
||||||
'login': login,
|
"password": "demo",
|
||||||
'password': 'demo',
|
"email": "test@yourcompany.com",
|
||||||
'email': 'test@yourcompany.com',
|
"company_id": company.id,
|
||||||
'company_id': company.id,
|
"company_ids": [(4, company.id)],
|
||||||
'company_ids': [(4, company.id)],
|
"groups_id": [(6, 0, group_ids)],
|
||||||
'groups_id': [(6, 0, group_ids)]
|
}
|
||||||
})
|
)
|
||||||
return user.id
|
return user.id
|
||||||
|
|
||||||
def _create_account_type(self, name, type):
|
def _create_account_type(self, name, type):
|
||||||
acc_type = self.acc_type_model.create({
|
acc_type = self.acc_type_model.create({"name": name, "type": type})
|
||||||
'name': name,
|
|
||||||
'type': type
|
|
||||||
})
|
|
||||||
return acc_type
|
return acc_type
|
||||||
|
|
||||||
def _create_account(self, acc_type, name, code, company):
|
def _create_account(self, acc_type, name, code, company):
|
||||||
"""Create an account."""
|
"""Create an account."""
|
||||||
account = self.account_model.create({
|
account = self.account_model.create(
|
||||||
'name': name,
|
{
|
||||||
'code': code,
|
"name": name,
|
||||||
'user_type_id': acc_type.id,
|
"code": code,
|
||||||
'company_id': company.id
|
"user_type_id": acc_type.id,
|
||||||
})
|
"company_id": company.id,
|
||||||
|
}
|
||||||
|
)
|
||||||
return account
|
return account
|
||||||
|
|
||||||
def _create_product(self):
|
def _create_product(self):
|
||||||
"""Create a Product."""
|
"""Create a Product."""
|
||||||
# group_ids = [group.id for group in groups]
|
# group_ids = [group.id for group in groups]
|
||||||
product_ctg = self.product_ctg_model.create({
|
product_ctg = self.product_ctg_model.create(
|
||||||
'name': 'test_product_ctg',
|
{
|
||||||
'property_stock_valuation_account_id': self.account_inventory.id,
|
"name": "test_product_ctg",
|
||||||
'property_valuation': 'real_time',
|
"property_stock_valuation_account_id": self.account_inventory.id,
|
||||||
'property_stock_account_input_categ_id': self.account_grni.id,
|
"property_valuation": "real_time",
|
||||||
'property_stock_account_output_categ_id': self.account_cogs.id,
|
"property_stock_account_input_categ_id": self.account_grni.id,
|
||||||
})
|
"property_stock_account_output_categ_id": self.account_cogs.id,
|
||||||
product = self.product_model.create({
|
}
|
||||||
'name': 'test_product',
|
)
|
||||||
'categ_id': product_ctg.id,
|
product = self.product_model.create(
|
||||||
'type': 'product',
|
{
|
||||||
'standard_price': 1.0,
|
"name": "test_product",
|
||||||
'list_price': 1.0,
|
"categ_id": product_ctg.id,
|
||||||
})
|
"type": "product",
|
||||||
|
"standard_price": 1.0,
|
||||||
|
"list_price": 1.0,
|
||||||
|
}
|
||||||
|
)
|
||||||
return product
|
return product
|
||||||
|
|
||||||
def _create_sale(self, line_products):
|
def _create_sale(self, line_products):
|
||||||
@ -122,47 +122,46 @@ class TestAccountMoveLineSaleInfo(common.TransactionCase):
|
|||||||
lines = []
|
lines = []
|
||||||
for product, qty in line_products:
|
for product, qty in line_products:
|
||||||
line_values = {
|
line_values = {
|
||||||
'name': product.name,
|
"name": product.name,
|
||||||
'product_id': product.id,
|
"product_id": product.id,
|
||||||
'product_qty': qty,
|
"product_qty": qty,
|
||||||
'product_uom': product.uom_id.id,
|
"product_uom": product.uom_id.id,
|
||||||
'price_unit': 500,
|
"price_unit": 500,
|
||||||
'date_planned': fields.datetime.now()
|
"date_planned": fields.datetime.now(),
|
||||||
}
|
}
|
||||||
lines.append(
|
lines.append((0, 0, line_values))
|
||||||
(0, 0, line_values)
|
return self.sale_model.create(
|
||||||
)
|
{"partner_id": self.partner1.id, "order_line": lines}
|
||||||
return self.sale_model.create({
|
)
|
||||||
'partner_id': self.partner1.id,
|
|
||||||
'order_line': lines
|
|
||||||
})
|
|
||||||
|
|
||||||
def _get_balance(self, domain):
|
def _get_balance(self, domain):
|
||||||
"""
|
"""
|
||||||
Call read_group method and return the balance of particular account.
|
Call read_group method and return the balance of particular account.
|
||||||
"""
|
"""
|
||||||
aml_rec = self.aml_model.read_group(domain,
|
aml_rec = self.aml_model.read_group(
|
||||||
['debit', 'credit', 'account_id'],
|
domain, ["debit", "credit", "account_id"], ["account_id"]
|
||||||
['account_id'])
|
)
|
||||||
if aml_rec:
|
if aml_rec:
|
||||||
return aml_rec[0].get('debit', 0) - aml_rec[0].get('credit', 0)
|
return aml_rec[0].get("debit", 0) - aml_rec[0].get("credit", 0)
|
||||||
else:
|
else:
|
||||||
return 0.0
|
return 0.0
|
||||||
|
|
||||||
def _check_account_balance(self, account_id, sale_line=None,
|
def _check_account_balance(self, account_id, sale_line=None, expected_balance=0.0):
|
||||||
expected_balance=0.0):
|
|
||||||
"""
|
"""
|
||||||
Check the balance of the account
|
Check the balance of the account
|
||||||
"""
|
"""
|
||||||
domain = [('account_id', '=', account_id)]
|
domain = [("account_id", "=", account_id)]
|
||||||
if sale_line:
|
if sale_line:
|
||||||
domain.extend([('sale_line_id', '=', sale_line.id)])
|
domain.extend([("sale_line_id", "=", sale_line.id)])
|
||||||
|
|
||||||
balance = self._get_balance(domain)
|
balance = self._get_balance(domain)
|
||||||
if sale_line:
|
if sale_line:
|
||||||
self.assertEqual(balance, expected_balance,
|
self.assertEqual(
|
||||||
'Balance is not %s for sale Line %s.'
|
balance,
|
||||||
% (str(expected_balance), sale_line.name))
|
expected_balance,
|
||||||
|
"Balance is not %s for sale Line %s."
|
||||||
|
% (str(expected_balance), sale_line.name),
|
||||||
|
)
|
||||||
|
|
||||||
def test_sale_invoice(self):
|
def test_sale_invoice(self):
|
||||||
"""Test that the po line moves from the sale order to the
|
"""Test that the po line moves from the sale order to the
|
||||||
@ -176,35 +175,48 @@ class TestAccountMoveLineSaleInfo(common.TransactionCase):
|
|||||||
sale.button_confirm()
|
sale.button_confirm()
|
||||||
picking = sale.picking_ids[0]
|
picking = sale.picking_ids[0]
|
||||||
picking.force_assign()
|
picking.force_assign()
|
||||||
picking.move_lines.write({'quantity_done': 1.0})
|
picking.move_lines.write({"quantity_done": 1.0})
|
||||||
picking.button_validate()
|
picking.button_validate()
|
||||||
|
|
||||||
expected_balance = 1.0
|
expected_balance = 1.0
|
||||||
self._check_account_balance(self.account_inventory.id,
|
self._check_account_balance(
|
||||||
sale_line=po_line,
|
self.account_inventory.id,
|
||||||
expected_balance=expected_balance)
|
sale_line=po_line,
|
||||||
|
expected_balance=expected_balance,
|
||||||
|
)
|
||||||
|
|
||||||
invoice = self.invoice_model.create({
|
invoice = self.invoice_model.create(
|
||||||
'partner_id': self.partner1.id,
|
{
|
||||||
'sale_id': sale.id,
|
"partner_id": self.partner1.id,
|
||||||
'account_id': sale.partner_id.property_account_payable_id.id,
|
"sale_id": sale.id,
|
||||||
})
|
"account_id": sale.partner_id.property_account_payable_id.id,
|
||||||
|
}
|
||||||
|
)
|
||||||
invoice.sale_order_change()
|
invoice.sale_order_change()
|
||||||
invoice.action_invoice_open()
|
invoice.action_invoice_open()
|
||||||
|
|
||||||
for aml in invoice.move_id.line_ids:
|
for aml in invoice.move_id.line_ids:
|
||||||
if aml.product_id == po_line.product_id and aml.invoice_id:
|
if aml.product_id == po_line.product_id and aml.invoice_id:
|
||||||
self.assertEqual(aml.sale_line_id, po_line,
|
self.assertEqual(
|
||||||
'sale Order line has not been copied '
|
aml.sale_line_id,
|
||||||
'from the invoice to the account move line.')
|
po_line,
|
||||||
|
"sale Order line has not been copied "
|
||||||
|
"from the invoice to the account move line.",
|
||||||
|
)
|
||||||
|
|
||||||
def test_name_get(self):
|
def test_name_get(self):
|
||||||
sale = self._create_sale([(self.product, 1)])
|
sale = self._create_sale([(self.product, 1)])
|
||||||
po_line = sale.order_line[0]
|
po_line = sale.order_line[0]
|
||||||
name_get = po_line.with_context({'po_line_info': True}).name_get()
|
name_get = po_line.with_context({"po_line_info": True}).name_get()
|
||||||
self.assertEqual(name_get, [(po_line.id, "[%s] %s (%s)" % (
|
self.assertEqual(
|
||||||
po_line.order_id.name, po_line.name,
|
name_get,
|
||||||
po_line.order_id.state,
|
[
|
||||||
))])
|
(
|
||||||
|
po_line.id,
|
||||||
|
"[%s] %s (%s)"
|
||||||
|
% (po_line.order_id.name, po_line.name, po_line.order_id.state,),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
)
|
||||||
name_get_no_ctx = po_line.name_get()
|
name_get_no_ctx = po_line.name_get()
|
||||||
self.assertEqual(name_get_no_ctx, [(po_line.id, po_line.name)])
|
self.assertEqual(name_get_no_ctx, [(po_line.id, po_line.name)])
|
||||||
|
@ -1,70 +1,89 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<odoo>
|
<odoo>
|
||||||
|
|
||||||
<record id="view_move_line_form" model="ir.ui.view">
|
<record id="view_move_line_form" model="ir.ui.view">
|
||||||
<field name="name">account.move.line.form</field>
|
<field name="name">account.move.line.form</field>
|
||||||
<field name="model">account.move.line</field>
|
<field name="model">account.move.line</field>
|
||||||
<field name="inherit_id" ref="account.view_move_line_form"/>
|
<field name="inherit_id" ref="account.view_move_line_form" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="quantity" position="before">
|
<field name="quantity" position="before">
|
||||||
<field name="sale_id"
|
<field
|
||||||
groups="account_move_line_sale_info.group_account_move_sale_info"/>
|
name="sale_id"
|
||||||
<field name="sale_line_id"
|
groups="account_move_line_sale_info.group_account_move_sale_info"
|
||||||
groups="account_move_line_sale_info.group_account_move_sale_info"/>
|
/>
|
||||||
|
<field
|
||||||
|
name="sale_line_id"
|
||||||
|
groups="account_move_line_sale_info.group_account_move_sale_info"
|
||||||
|
/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record id="view_move_line_tree" model="ir.ui.view">
|
<record id="view_move_line_tree" model="ir.ui.view">
|
||||||
<field name="name">account.move.line.tree</field>
|
<field name="name">account.move.line.tree</field>
|
||||||
<field name="model">account.move.line</field>
|
<field name="model">account.move.line</field>
|
||||||
<field name="inherit_id" ref="account.view_move_line_tree"/>
|
<field name="inherit_id" ref="account.view_move_line_tree" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="partner_id" position="after">
|
<field name="partner_id" position="after">
|
||||||
<field name="sale_id"
|
<field
|
||||||
groups="account_move_line_sale_info.group_account_move_sale_info"/>
|
name="sale_id"
|
||||||
<field name="sale_line_id"
|
groups="account_move_line_sale_info.group_account_move_sale_info"
|
||||||
groups="account_move_line_sale_info.group_account_move_sale_info"/>
|
/>
|
||||||
|
<field
|
||||||
|
name="sale_line_id"
|
||||||
|
groups="account_move_line_sale_info.group_account_move_sale_info"
|
||||||
|
/>
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
||||||
<record id="view_account_move_line_filter" model="ir.ui.view">
|
<record id="view_account_move_line_filter" model="ir.ui.view">
|
||||||
<field name="name">Journal Items</field>
|
<field name="name">Journal Items</field>
|
||||||
<field name="model">account.move.line</field>
|
<field name="model">account.move.line</field>
|
||||||
<field name="inherit_id" ref="account.view_account_move_line_filter"/>
|
<field name="inherit_id" ref="account.view_account_move_line_filter" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="partner_id" position="after">
|
<field name="partner_id" position="after">
|
||||||
<field name="sale_line_id"
|
<field
|
||||||
groups="account_move_line_sale_info.group_account_move_sale_info"/>
|
name="sale_line_id"
|
||||||
<field name="sale_id"
|
groups="account_move_line_sale_info.group_account_move_sale_info"
|
||||||
groups="account_move_line_sale_info.group_account_move_sale_info"/>
|
/>
|
||||||
|
<field
|
||||||
|
name="sale_id"
|
||||||
|
groups="account_move_line_sale_info.group_account_move_sale_info"
|
||||||
|
/>
|
||||||
</field>
|
</field>
|
||||||
<group expand="0" position="inside">
|
<group expand="0" position="inside">
|
||||||
<filter string="sale Order" domain="[]"
|
<filter
|
||||||
context="{'group_by':'sale_id'}"
|
string="sale Order"
|
||||||
groups="account_move_line_sale_info.group_account_move_sale_info"/>
|
domain="[]"
|
||||||
<filter string="sale Order Line" domain="[]"
|
context="{'group_by':'sale_id'}"
|
||||||
context="{'group_by':'sale_line_id','so_line_info':True}"
|
groups="account_move_line_sale_info.group_account_move_sale_info"
|
||||||
groups="account_move_line_sale_info.group_account_move_sale_info"/>
|
/>
|
||||||
|
<filter
|
||||||
|
string="sale Order Line"
|
||||||
|
domain="[]"
|
||||||
|
context="{'group_by':'sale_line_id','so_line_info':True}"
|
||||||
|
groups="account_move_line_sale_info.group_account_move_sale_info"
|
||||||
|
/>
|
||||||
</group>
|
</group>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
||||||
<record id="view_move_form" model="ir.ui.view">
|
<record id="view_move_form" model="ir.ui.view">
|
||||||
<field name="name">account.move.form</field>
|
<field name="name">account.move.form</field>
|
||||||
<field name="model">account.move</field>
|
<field name="model">account.move</field>
|
||||||
<field name="inherit_id" ref="account.view_move_form"/>
|
<field name="inherit_id" ref="account.view_move_form" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//field[@name='line_ids']/tree//field[@name='partner_id']" position="after">
|
<xpath
|
||||||
<field name="sale_line_id" context="{'so_line_info': True}"
|
expr="//field[@name='line_ids']/tree//field[@name='partner_id']"
|
||||||
groups="account_move_line_sale_info.group_account_move_sale_info"/>
|
position="after"
|
||||||
<field name="sale_id"
|
>
|
||||||
groups="account_move_line_sale_info.group_account_move_sale_info"/>
|
<field
|
||||||
|
name="sale_line_id"
|
||||||
|
context="{'so_line_info': True}"
|
||||||
|
groups="account_move_line_sale_info.group_account_move_sale_info"
|
||||||
|
/>
|
||||||
|
<field
|
||||||
|
name="sale_id"
|
||||||
|
groups="account_move_line_sale_info.group_account_move_sale_info"
|
||||||
|
/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</odoo>
|
</odoo>
|
||||||
|
Loading…
Reference in New Issue
Block a user