Migrate to v10.0

- Add dependency sale because group "group_sale_salesman" and "group_sale_manager" are defined on modul sales_team
  * sale depend to sales_team
  * update ir.model.access base. -> sales_team.
- Fix product.prod_config_main not compatible and moved to sale.prod_config_main
- Make removed col="6 when add product supplier info field too small (width)
This commit is contained in:
bima
2017-05-24 20:46:48 +07:00
committed by Lois Suarez
parent da42eb5546
commit 1b816e1ea8
11 changed files with 22 additions and 21 deletions

View File

@@ -33,6 +33,7 @@ Contributors
* Ondřej Kuzník <ondrej.kuznik@credativ.co.uk> * Ondřej Kuzník <ondrej.kuznik@credativ.co.uk>
* Yanina Aular <yanina.aular@vauxoo.com> * Yanina Aular <yanina.aular@vauxoo.com>
* Cyril Gaudin <cyril.gaudin@camptocamp.com> * Cyril Gaudin <cyril.gaudin@camptocamp.com>
* Bima Jati Wijaya <bimajatiwijaya@gmail.com>
Maintainer Maintainer
---------- ----------

View File

@@ -22,12 +22,12 @@
{ {
'name': 'Product warranty', 'name': 'Product warranty',
'version': '9.0.1.0.0', 'version': '10.0.1.0.0',
'category': 'Generic Modules/Product', 'category': 'Generic Modules/Product',
'author': "Akretion,Odoo Community Association (OCA),Vauxoo", 'author': "Akretion,Odoo Community Association (OCA),Vauxoo",
'website': 'http://akretion.com', 'website': 'http://akretion.com',
'license': 'AGPL-3', 'license': 'AGPL-3',
'depends': ['product'], 'depends': ['product', 'sale'],
'data': [ 'data': [
'security/ir.model.access.csv', 'security/ir.model.access.csv',
'views/res_company.xml', 'views/res_company.xml',
@@ -38,7 +38,7 @@
'demo/res_company.xml', 'demo/res_company.xml',
], ],
'test': [], 'test': [],
'installable': False, 'installable': True,
'active': False, 'active': False,
'images': ['images/product_warranty.png'], 'images': ['images/product_warranty.png'],
} }

View File

@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <odoo>
<data noupdate="1"> <data noupdate="1">
<record id="return_instruction_1" model="return.instruction"> <record id="return_instruction_1" model="return.instruction">
@@ -61,4 +61,4 @@ Select the product you want to return and the reason for the return. You will ne
</record> </record>
</data> </data>
</openerp> </odoo>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <odoo>
<data noupdate="1"> <data noupdate="1">
<record id="base.main_company" model="res.company"> <record id="base.main_company" model="res.company">
@@ -7,4 +7,4 @@
</record> </record>
</data> </data>
</openerp> </odoo>

View File

@@ -4,7 +4,7 @@
# © 2009-2011 Akretion, Emmanuel Samyn, Benoît Guillot # © 2009-2011 Akretion, Emmanuel Samyn, Benoît Guillot
# 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).
from openerp import api, fields, models from odoo import api, fields, models
class ProductSupplierInfo(models.Model): class ProductSupplierInfo(models.Model):

View File

@@ -3,7 +3,7 @@
# © 2009-2013 Akretion, Emmanuel Samyn, Raphaël Valyi, Sébastien Beau # © 2009-2013 Akretion, Emmanuel Samyn, Raphaël Valyi, Sébastien Beau
# 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).
from openerp import fields, models from odoo import fields, models
class ResCompany(models.Model): class ResCompany(models.Model):

View File

@@ -4,7 +4,7 @@
# © 2009-2011 Akretion, Emmanuel Samyn, Benoît Guillot # © 2009-2011 Akretion, Emmanuel Samyn, Benoît Guillot
# 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).
from openerp import fields, models from odoo import fields, models
class ReturnInstruction(models.Model): class ReturnInstruction(models.Model):

View File

@@ -1,4 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_return_instruction_user","return.instruction.user","model_return_instruction","base.group_user","True","False","False","False" "access_return_instruction_user","return.instruction.user","model_return_instruction","base.group_user","True","False","False","False"
"access_return_instruction_manager","return.instruction.manager","model_return_instruction","base.group_sale_manager","True","True","True","True" "access_return_instruction_manager","return.instruction.manager","model_return_instruction","sales_team.group_sale_manager","True","True","True","True"
"access_return_instruction_salesman","return.instruction.salesman","model_return_instruction","base.group_sale_salesman","True","True","True","True" "access_return_instruction_salesman","return.instruction.salesman","model_return_instruction","sales_team.group_sale_salesman","True","True","True","True"
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_return_instruction_user return.instruction.user model_return_instruction base.group_user True False False False
3 access_return_instruction_manager return.instruction.manager model_return_instruction base.group_sale_manager sales_team.group_sale_manager True True True True
4 access_return_instruction_salesman return.instruction.salesman model_return_instruction base.group_sale_salesman sales_team.group_sale_salesman True True True True

View File

@@ -3,7 +3,7 @@
# © 2015 Vauxoo, Yanina Aular # © 2015 Vauxoo, Yanina Aular
# 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).
from openerp.tests.common import TransactionCase from odoo.tests.common import TransactionCase
class TestProductWarranty(TransactionCase): class TestProductWarranty(TransactionCase):

View File

@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <odoo>
<data> <data>
<!-- return instructions tree view --> <!-- return instructions tree view -->
<record model="ir.ui.view" id="product_return_instructions_tree_view"> <record model="ir.ui.view" id="product_return_instructions_tree_view">
@@ -20,7 +20,7 @@
<field name="model">return.instruction</field> <field name="model">return.instruction</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Return instructions"> <form string="Return instructions">
<group col='4'> <group name="return_instructions" col='4'>
<field name="name"/> <field name="name"/>
<field name="is_default"/> <field name="is_default"/>
</group> </group>
@@ -41,7 +41,7 @@
<menuitem action="product_return_instructions_action" <menuitem action="product_return_instructions_action"
groups="base.group_no_one" groups="base.group_no_one"
id="menu_product_return_instructions_action" id="menu_product_return_instructions_action"
parent="product.prod_config_main" sequence="3"/> parent="sale.prod_config_main" sequence="3"/>
<!-- supplier info tree view --> <!-- supplier info tree view -->
<record model="ir.ui.view" id="product_supplierinfo_warranty_tree_view"> <record model="ir.ui.view" id="product_supplierinfo_warranty_tree_view">
@@ -66,11 +66,11 @@
<field name="inherit_id" ref="product.product_supplierinfo_form_view" /> <field name="inherit_id" ref="product.product_supplierinfo_form_view" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//group[last()]" position="after"> <xpath expr="//group[last()]" position="after">
<group string="Warranty informations" colspan="4"> <group name="waranty_group" string="Warranty informations" colspan="4">
<field name="active_supplier"/> <field name="active_supplier"/>
<field name="warranty_duration"/> <field name="warranty_duration"/>
<field name="return_instructions"/> <field name="return_instructions"/>
<group colspan="4" col="6"> <group colspan="4">
<group> <group>
<field name="warranty_return_partner"/> <field name="warranty_return_partner"/>
</group> </group>
@@ -87,4 +87,4 @@
</record> </record>
</data> </data>
</openerp> </odoo>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <odoo>
<data> <data>
<!-- INHERITED VIEW FOR THE OBJECT : res_company --> <!-- INHERITED VIEW FOR THE OBJECT : res_company -->
@@ -18,4 +18,4 @@
</record> </record>
</data> </data>
</openerp> </odoo>