Move product stuff in account_product module
This commit is contained in:
Cédric Krier
+1
-1
@@ -1,4 +1,4 @@
|
||||
#This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
#this repository contains the full copyright notices and license terms.
|
||||
|
||||
from invoice import *
|
||||
from product import *
|
||||
|
||||
+1
-1
@@ -17,10 +17,10 @@
|
||||
'res',
|
||||
'workflow',
|
||||
'currency',
|
||||
'account_product',
|
||||
],
|
||||
'xml': [
|
||||
'invoice.xml',
|
||||
'product.xml',
|
||||
],
|
||||
'translation': [
|
||||
'fr_FR.csv',
|
||||
|
||||
-112
@@ -1,112 +0,0 @@
|
||||
#This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
#this repository contains the full copyright notices and license terms.
|
||||
|
||||
from trytond.osv import fields, OSV
|
||||
|
||||
|
||||
class Category(OSV):
|
||||
_name = 'product.category'
|
||||
|
||||
account_expense = fields.Property(type='many2one',
|
||||
relation='account.account', string='Account Expense',
|
||||
group_name='Accounting Properties', view_load=True,
|
||||
domain="[('kind', '=', 'expense'), ('company', '=', company)]",
|
||||
states={
|
||||
'invisible': "not company",
|
||||
})
|
||||
account_revenue = fields.Property(type='many2one',
|
||||
relation='account.account', string='Account Revenue',
|
||||
group_name='Accounting Properties', view_load=True,
|
||||
domain="[('kind', '=', 'revenue'), ('company', '=', company)]",
|
||||
states={
|
||||
'invisible': "not company",
|
||||
})
|
||||
customer_taxes = fields.Many2Many('account.tax',
|
||||
'product_customer_taxes_rel', 'product', 'tax',
|
||||
'Customer Taxes', domain=[('parent', '=', False)])
|
||||
supplier_taxes = fields.Many2Many('account.tax',
|
||||
'product_supplier_taxes_rel', 'product', 'tax',
|
||||
'Supplier Taxes', domain=[('parent', '=', False)])
|
||||
|
||||
Category()
|
||||
|
||||
|
||||
class Template(OSV):
|
||||
_name = 'product.template'
|
||||
|
||||
account_expense = fields.Property(type='many2one',
|
||||
string='Account Expense', group_name='Accounting Properties',
|
||||
view_load=True, relation='account.account',
|
||||
domain="[('kind', '=', 'expense'), ('company', '=', company)]",
|
||||
states={
|
||||
'invisible': "not company",
|
||||
}, help='This account will be used instead of the one defined ' \
|
||||
'on the category.')
|
||||
account_revenue = fields.Property(type='many2one',
|
||||
string='Account Revenue', group_name='Accounting Properties',
|
||||
view_load=True, relation='account.account',
|
||||
domain="[('kind', '=', 'revenue'), ('company', '=', company)]",
|
||||
states={
|
||||
'invisible': "not company",
|
||||
}, help='This account will be used instead of the one defined ' \
|
||||
'on the category.')
|
||||
account_expense_used = fields.Function('get_account', type='many2one',
|
||||
relation='account.account', string='Account Expense Used')
|
||||
account_revenue_used = fields.Function('get_account', type='many2one',
|
||||
relation='account.account', string='Account Revenue Used')
|
||||
taxes_category = fields.Boolean('Use Category\'s Taxes', help='Use the taxes ' \
|
||||
'defined on the category')
|
||||
customer_taxes = fields.Many2Many('account.tax',
|
||||
'product_customer_taxes_rel', 'product', 'tax',
|
||||
'Customer Taxes', domain=[('parent', '=', False)], states={
|
||||
'invisible': "bool(taxes_category)",
|
||||
})
|
||||
supplier_taxes = fields.Many2Many('account.tax',
|
||||
'product_supplier_taxes_rel', 'product', 'tax',
|
||||
'Supplier Taxes', domain=[('parent', '=', False)], states={
|
||||
'invisible': "bool(taxes_category)",
|
||||
})
|
||||
customer_taxes_used = fields.Function('get_taxes', type='many2many',
|
||||
relation='account.tax', string='Customer Taxes Used')
|
||||
supplier_taxes_used = fields.Function('get_taxes', type='many2many',
|
||||
relation='account.tax', string='Customer Taxes Used')
|
||||
|
||||
def __init__(self):
|
||||
super(Template, self).__init__()
|
||||
self._error_messages.update({
|
||||
'missing_account': 'There is no account ' \
|
||||
'expense/revenue define on the product ' \
|
||||
'%s (%d)',
|
||||
})
|
||||
|
||||
def default_taxes_category(self, cursor, user, context=None):
|
||||
return False
|
||||
|
||||
def get_account(self, cursor, user, ids, name, arg, context=None):
|
||||
account_obj = self.pool.get('account.account')
|
||||
res = {}
|
||||
name = name[:-5]
|
||||
for product in self.browse(cursor, user, ids, context=context):
|
||||
if product[name]:
|
||||
res[product.id] = account_obj.name_get(cursor, user,
|
||||
product[name].id, context=context)[0]
|
||||
else:
|
||||
if product.category[name]:
|
||||
res[product.id] = account_obj.name_get(cursor, user,
|
||||
product.category[name].id, context=context)[0]
|
||||
else:
|
||||
self.raise_user_error(cursor, 'missing_account',
|
||||
(product.name, product.id), context=context)
|
||||
return res
|
||||
|
||||
def get_taxes(self, cursor, user, ids, name, arg, context=None):
|
||||
res = {}
|
||||
name = name[:-5]
|
||||
for product in self.browse(cursor, user, ids, context=context):
|
||||
if product.taxes_category:
|
||||
res[product.id] = [x.id for x in product.category[name]]
|
||||
else:
|
||||
res[product.id] = [x.id for x in product[name]]
|
||||
return res
|
||||
|
||||
Template()
|
||||
-52
@@ -1,52 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
<tryton>
|
||||
<data>
|
||||
|
||||
<record model="ir.ui.view" id="category_view_form">
|
||||
<field name="model">product.category</field>
|
||||
<field name="inherit" ref="product.category_view_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<![CDATA[
|
||||
<data>
|
||||
<xpath
|
||||
expr="/form/notebook/page[@string="Properties"]"
|
||||
position="before">
|
||||
<page string="Taxes" col="4">
|
||||
<separator name="customer_taxes" colspan="4"/>
|
||||
<field name="customer_taxes" colspan="4"/>
|
||||
<separator name="supplier_taxes" colspan="4"/>
|
||||
<field name="supplier_taxes" colspan="4"/>
|
||||
</page>
|
||||
</xpath>
|
||||
</data>
|
||||
]]>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="product_view_form">
|
||||
<field name="model">product.product</field>
|
||||
<field name="inherit" ref="product.product_view_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<![CDATA[
|
||||
<data>
|
||||
<xpath
|
||||
expr="/form/notebook/page[@string="Properties"]"
|
||||
position="before">
|
||||
<page string="Taxes" col="4">
|
||||
<label name="taxes_category"/>
|
||||
<field name="taxes_category"/>
|
||||
<separator name="customer_taxes" colspan="4"/>
|
||||
<field name="customer_taxes" colspan="4"/>
|
||||
<separator name="supplier_taxes" colspan="4"/>
|
||||
<field name="supplier_taxes" colspan="4"/>
|
||||
</page>
|
||||
</xpath>
|
||||
</data>
|
||||
]]>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</tryton>
|
||||
Reference in New Issue
Block a user