audrius/rma
1
0
Fork 1
mirror of https://github.com/OCA/rma.git synced 2025-02-16 17:11:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to v10.0

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

1
product_warranty/README.rst
View File

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

6
product_warranty/__manifest__.py
View File

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

4
product_warranty/demo/product_warranty.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<openerp>
<odoo>
<data noupdate="1">
<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>
</data>
</openerp>
</odoo>

4
product_warranty/demo/res_company.xml
View File

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

2
product_warranty/models/product_supplierinfo.py
View File

@@ -4,7 +4,7 @@
# © 2009-2011 Akretion, Emmanuel Samyn, Benoît Guillot
# 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):

2
product_warranty/models/res_company.py
View File

@@ -3,7 +3,7 @@
# © 2009-2013 Akretion, Emmanuel Samyn, Raphaël Valyi, Sébastien Beau
# 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):

2
product_warranty/models/return_instruction.py
View File

@@ -4,7 +4,7 @@
# © 2009-2011 Akretion, Emmanuel Samyn, Benoît Guillot
# 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):

4
product_warranty/security/ir.model.access.csv
View File

@@ -1,4 +1,4 @@
"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_manager","return.instruction.manager","model_return_instruction","base.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_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","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

2
product_warranty/tests/test_product_warranty.py
View File

@@ -3,7 +3,7 @@
# © 2015 Vauxoo, Yanina Aular
# 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):

12
product_warranty/views/product_warranty.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<openerp>
<odoo>
<data>
<!-- 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="arch" type="xml">
<form string="Return instructions">
<group col='4'>
<group name="return_instructions" col='4'>
<field name="name"/>
<field name="is_default"/>
</group>
@@ -41,7 +41,7 @@
<menuitem action="product_return_instructions_action"
groups="base.group_no_one"
id="menu_product_return_instructions_action"
parent="product.prod_config_main" sequence="3"/>
parent="sale.prod_config_main" sequence="3"/>
<!-- supplier info 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="arch" type="xml">
<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="warranty_duration"/>
<field name="return_instructions"/>
<group colspan="4" col="6">
<group colspan="4">
<group>
<field name="warranty_return_partner"/>
</group>
@@ -87,4 +87,4 @@
</record>
</data>
</openerp>
</odoo>

4
product_warranty/views/res_company.xml
View File

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