tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Fix wrong field names for issue1585

Browse Source 
Rename product field into category for product.category-customer-account.tax
and product.category-supplier-account.tax
This commit is contained in:
Cédric Krier
2010-07-15 11:13:31 +02:00
parent 952357eddf
commit e5bb721805
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+3
View File
@@ -1,3 +1,6 @@
* Rename product field into category for product.category-customer-account.tax
and product.category-supplier-account.tax
Version 1.6.0 - 2010-05-12
* Bug fixes (see mercurial logs for details)
product.py
+23 -4
View File
@@ -2,6 +2,7 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Not, Eval, Bool, Or
from trytond.backend import TableHandler
class Category(ModelSQL, ModelView):
@@ -24,9 +25,9 @@ class Category(ModelSQL, ModelView):
'invisible': Not(Bool(Eval('company'))),
}))
customer_taxes = fields.Many2Many('product.category-customer-account.tax',
'product', 'tax', 'Customer Taxes', domain=[('parent', '=', False)])
'category', 'tax', 'Customer Taxes', domain=[('parent', '=', False)])
supplier_taxes = fields.Many2Many('product.category-supplier-account.tax',
'product', 'tax', 'Supplier Taxes', domain=[('parent', '=', False)])
'category', 'tax', 'Supplier Taxes', domain=[('parent', '=', False)])
Category()
@@ -36,11 +37,20 @@ class CategoryCustomerTax(ModelSQL):
_name = 'product.category-customer-account.tax'
_table = 'product_category_customer_taxes_rel'
_description = __doc__
product = fields.Many2One('product.category', 'Category',
category = fields.Many2One('product.category', 'Category',
ondelete='CASCADE', select=1, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
def init(self, cursor, module_name):
# Migration from 1.6 product renamed into category
table = TableHandler(cursor, self)
if table.column_exist('product'):
table.index_action('product', action='remove')
table.drop_fk('product')
table.column_rename('product', 'category')
super(CategoryCustomerTax, self).init(cursor, module_name)
CategoryCustomerTax()
@@ -49,11 +59,20 @@ class CategorySupplierTax(ModelSQL):
_name = 'product.category-supplier-account.tax'
_table = 'product_category_supplier_taxes_rel'
_description = __doc__
product = fields.Many2One('product.category', 'Category',
category = fields.Many2One('product.category', 'Category',
ondelete='CASCADE', select=1, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
def init(self, cursor, module_name):
# Migration from 1.6 product renamed into category
table = TableHandler(cursor, self)
if table.column_exist('product'):
table.index_action('product', action='remove')
table.drop_fk('product')
table.column_rename('product', 'category')
super(CategorySupplierTax, self).init(cursor, module_name)
CategorySupplierTax()