Browse Source
[MIG] base_location: Migrated to 10.0
[MIG] base_location: Migrated to 10.0
* Headers shortened * Move cities management to settingspull/523/head
Francesco Apruzzese
8 years ago
committed by
Jairo Llopis
Jairo Llopis
15 changed files with 174 additions and 294 deletions
-
5base_location/README.rst
-
23base_location/__init__.py
-
40base_location/__manifest__.py
-
6base_location/models/__init__.py
-
25base_location/models/better_zip.py
-
28base_location/models/company.py
-
27base_location/models/partner.py
-
26base_location/models/state.py
-
5base_location/tests/__init__.py
-
7base_location/tests/test_completion.py
-
130base_location/views/better_zip_view.xml
-
32base_location/views/company_view.xml
-
42base_location/views/partner_view.xml
-
26base_location/views/res_country_view.xml
-
46base_location/views/state_view.xml
@ -1,24 +1,5 @@ |
|||||
# -*- coding: utf-8 -*- |
# -*- coding: utf-8 -*- |
||||
############################################################################## |
|
||||
# |
|
||||
# Author: Nicolas Bessi. Copyright Camptocamp SA |
|
||||
# Contributor: Pedro Manuel Baeza <pedro.baeza@serviciosbaeza.com> |
|
||||
# Ignacio Ibeas <ignacio@acysos.com> |
|
||||
# Alejandro Santana <alejandrosantana@anubia.es> |
|
||||
# |
|
||||
# This program is free software: you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU Affero General Public License as |
|
||||
# published by the Free Software Foundation, either version 3 of the |
|
||||
# License, or (at your option) any later version. |
|
||||
# |
|
||||
# This program is distributed in the hope that it will be useful, |
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
# GNU Affero General Public License for more details. |
|
||||
# |
|
||||
# You should have received a copy of the GNU Affero General Public License |
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
||||
# |
|
||||
############################################################################## |
|
||||
|
# Copyright 2016 Nicolas Bessi, Camptocamp SA |
||||
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
||||
|
|
||||
from . import models |
from . import models |
||||
@ -1,4 +1,5 @@ |
|||||
# -*- coding: utf-8 -*- |
# -*- coding: utf-8 -*- |
||||
# © 2015 Yannick Vaucher (Camptocamp) |
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). |
|
||||
|
# Copyright 2015 Yannick Vaucher, Camptocamp SA |
||||
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
||||
|
|
||||
from . import test_completion |
from . import test_completion |
||||
@ -1,70 +1,74 @@ |
|||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||
<openerp> |
|
||||
<data> |
|
||||
|
<odoo> |
||||
|
|
||||
<record model="ir.ui.view" id="better_zip_form"> |
|
||||
<field name="name">res.better.zip.form</field> |
|
||||
<field name="model">res.better.zip</field> |
|
||||
<field name="arch" type="xml"> |
|
||||
<form string="ZIP"> |
|
||||
<group col="4"> |
|
||||
<field name="name"/> |
|
||||
<field name="code"/> |
|
||||
<field name="city"/> |
|
||||
<field name="state_id"/> |
|
||||
<field name="country_id"/> |
|
||||
</group> |
|
||||
</form> |
|
||||
</field> |
|
||||
</record> |
|
||||
|
<record model="ir.ui.view" id="better_zip_form"> |
||||
|
<field name="name">res.better.zip.form</field> |
||||
|
<field name="model">res.better.zip</field> |
||||
|
<field name="arch" type="xml"> |
||||
|
<form string="City"> |
||||
|
<group col="4"> |
||||
|
<field name="name"/> |
||||
|
<field name="code"/> |
||||
|
<field name="city"/> |
||||
|
<field name="state_id"/> |
||||
|
<field name="country_id"/> |
||||
|
</group> |
||||
|
</form> |
||||
|
</field> |
||||
|
</record> |
||||
|
|
||||
|
<record model="ir.ui.view" id="better_zip_tree"> |
||||
|
<field name="name">res.better.zip.tree</field> |
||||
|
<field name="model">res.better.zip</field> |
||||
|
<field name="arch" type="xml"> |
||||
|
<tree string="Cities"> |
||||
|
<field name="name"/> |
||||
|
<field name="code"/> |
||||
|
<field name="city"/> |
||||
|
<field name="state_id"/> |
||||
|
<field name="country_id"/> |
||||
|
</tree> |
||||
|
</field> |
||||
|
</record> |
||||
|
|
||||
<record model="ir.ui.view" id="better_zip_tree"> |
|
||||
<field name="name">res.better.zip.tree</field> |
|
||||
<field name="model">res.better.zip</field> |
|
||||
<field name="arch" type="xml"> |
|
||||
<tree string="ZIP"> |
|
||||
<field name="name"/> |
|
||||
<field name="code"/> |
|
||||
<field name="city"/> |
|
||||
<field name="state_id"/> |
|
||||
<field name="country_id"/> |
|
||||
</tree> |
|
||||
</field> |
|
||||
</record> |
|
||||
|
<record id="view_better_zip_filter" model="ir.ui.view"> |
||||
|
<field name="name">res.better.zip.select</field> |
||||
|
<field name="model">res.better.zip</field> |
||||
|
<field name="arch" type="xml"> |
||||
|
<search string="Search city"> |
||||
|
<field name="name"/> |
||||
|
<field name="code"/> |
||||
|
<field name="city"/> |
||||
|
<field name="state_id"/> |
||||
|
<field name="country_id"/> |
||||
|
<group expand="0" string="Group By"> |
||||
|
<filter string="State" domain="[]" context="{'group_by':'state_id'}"/> |
||||
|
<filter string="Country" domain="[]" context="{'group_by':'country_id'}"/> |
||||
|
</group> |
||||
|
</search> |
||||
|
</field> |
||||
|
</record> |
||||
|
|
||||
<record id="view_better_zip_filter" model="ir.ui.view"> |
|
||||
<field name="name">res.better.zip.select</field> |
|
||||
<field name="model">res.better.zip</field> |
|
||||
<field name="arch" type="xml"> |
|
||||
<search string="Search city"> |
|
||||
<field name="name"/> |
|
||||
<field name="code"/> |
|
||||
<field name="city"/> |
|
||||
<field name="state_id"/> |
|
||||
<field name="country_id"/> |
|
||||
<group expand="0" string="Group By"> |
|
||||
<filter string="State" domain="[]" context="{'group_by':'state_id'}"/> |
|
||||
<filter string="Country" domain="[]" context="{'group_by':'country_id'}"/> |
|
||||
</group> |
|
||||
</search> |
|
||||
</field> |
|
||||
</record> |
|
||||
|
<record id="action_zip_tree" model="ir.actions.act_window"> |
||||
|
<field name="name">Cites/locations</field> |
||||
|
<field name="res_model">res.better.zip</field> |
||||
|
<field name="view_type">form</field> |
||||
|
<field name="view_mode">tree,form</field> |
||||
|
<field ref="better_zip_tree" name="view_id"/> |
||||
|
<field name="search_view_id" ref="view_better_zip_filter"/> |
||||
|
</record> |
||||
|
|
||||
<record id="action_zip_tree" model="ir.actions.act_window"> |
|
||||
<field name="name">Cites/locations Management</field> |
|
||||
<field name="res_model">res.better.zip</field> |
|
||||
<field name="view_type">form</field> |
|
||||
<field name="view_mode">tree,form</field> |
|
||||
<field ref="better_zip_tree" name="view_id"/> |
|
||||
<field name="search_view_id" ref="view_better_zip_filter"/> |
|
||||
</record> |
|
||||
|
<menuitem |
||||
|
name="Cities/Locations Management" |
||||
|
id="locations_root_menu" |
||||
|
parent="base.menu_custom" |
||||
|
/> |
||||
|
|
||||
<menuitem |
|
||||
name="Cities/Locations Management" |
|
||||
id="zip_base" |
|
||||
parent="base.menu_localisation" |
|
||||
action="action_zip_tree" |
|
||||
/> |
|
||||
|
<menuitem |
||||
|
name="Cities/Locations" |
||||
|
id="locations_menu" |
||||
|
parent="locations_root_menu" |
||||
|
action="action_zip_tree" |
||||
|
/> |
||||
|
|
||||
</data> |
|
||||
</openerp> |
|
||||
|
</odoo> |
||||
@ -1,21 +1,19 @@ |
|||||
<?xml version="1.0"?> |
<?xml version="1.0"?> |
||||
<openerp> |
|
||||
<data> |
|
||||
|
<odoo> |
||||
|
|
||||
<!-- Add cities to the company form --> |
|
||||
<record id="view_company_form_city" model="ir.ui.view"> |
|
||||
<field name="name">res.company.form.city</field> |
|
||||
<field name="model">res.company</field> |
|
||||
<field name="inherit_id" ref="base.view_company_form" /> |
|
||||
<field name="arch" type="xml"> |
|
||||
<field name="street2" position="after"> |
|
||||
<field name="better_zip_id" |
|
||||
options="{'create_name_field': 'city'}" |
|
||||
colspan="4" |
|
||||
placeholder="City completion" /> |
|
||||
</field> |
|
||||
|
<!-- Add cities to the company form --> |
||||
|
<record id="view_company_form_city" model="ir.ui.view"> |
||||
|
<field name="name">res.company.form.city</field> |
||||
|
<field name="model">res.company</field> |
||||
|
<field name="inherit_id" ref="base.view_company_form" /> |
||||
|
<field name="arch" type="xml"> |
||||
|
<field name="street2" position="after"> |
||||
|
<field name="better_zip_id" |
||||
|
options="{'create_name_field': 'city'}" |
||||
|
colspan="4" |
||||
|
placeholder="City completion" /> |
||||
</field> |
</field> |
||||
</record> |
|
||||
|
</field> |
||||
|
</record> |
||||
|
|
||||
</data> |
|
||||
</openerp> |
|
||||
|
</odoo> |
||||
@ -1,26 +1,24 @@ |
|||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||
<openerp> |
|
||||
<data> |
|
||||
|
<odoo> |
||||
|
|
||||
<record id="view_partner_form" model="ir.ui.view"> |
|
||||
<field name="name">res.partner.zip_id.2</field> |
|
||||
<field name="model">res.partner</field> |
|
||||
<field name="inherit_id" ref="base.view_partner_form" /> |
|
||||
<field name="arch" type="xml"> |
|
||||
<field name="city" position="before"> |
|
||||
<field name="zip_id" |
|
||||
options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" |
|
||||
placeholder="City completion" |
|
||||
class="oe_edit_only" /> |
|
||||
</field> |
|
||||
<xpath expr="//field[@name='child_ids']/form//field[@name='city']" position="before"> |
|
||||
<field name="zip_id" |
|
||||
options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" |
|
||||
placeholder="City completion" |
|
||||
class="oe_edit_only" /> |
|
||||
</xpath> |
|
||||
|
<record id="view_partner_form" model="ir.ui.view"> |
||||
|
<field name="name">res.partner.zip_id.2</field> |
||||
|
<field name="model">res.partner</field> |
||||
|
<field name="inherit_id" ref="base.view_partner_form" /> |
||||
|
<field name="arch" type="xml"> |
||||
|
<field name="city" position="before"> |
||||
|
<field name="zip_id" |
||||
|
options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" |
||||
|
placeholder="City completion" |
||||
|
class="oe_edit_only" /> |
||||
</field> |
</field> |
||||
</record> |
|
||||
|
<xpath expr="//field[@name='child_ids']/form//field[@name='city']" position="before"> |
||||
|
<field name="zip_id" |
||||
|
options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" |
||||
|
placeholder="City completion" |
||||
|
class="oe_edit_only" /> |
||||
|
</xpath> |
||||
|
</field> |
||||
|
</record> |
||||
|
|
||||
</data> |
|
||||
</openerp> |
|
||||
|
</odoo> |
||||
@ -1,17 +1,15 @@ |
|||||
<?xml version="1.0" encoding="utf-8"?> |
<?xml version="1.0" encoding="utf-8"?> |
||||
<openerp> |
|
||||
<data> |
|
||||
|
<odoo> |
||||
|
|
||||
<record id="view_country_search" model="ir.ui.view"> |
|
||||
<field name="name">res.country.search</field> |
|
||||
<field name="model">res.country</field> |
|
||||
<field name="arch" type="xml"> |
|
||||
<search string="Country"> |
|
||||
<field name="name"/> |
|
||||
<field name="code"/> |
|
||||
</search> |
|
||||
</field> |
|
||||
</record> |
|
||||
|
<record id="view_country_search" model="ir.ui.view"> |
||||
|
<field name="name">res.country.search</field> |
||||
|
<field name="model">res.country</field> |
||||
|
<field name="arch" type="xml"> |
||||
|
<search string="Country"> |
||||
|
<field name="name"/> |
||||
|
<field name="code"/> |
||||
|
</search> |
||||
|
</field> |
||||
|
</record> |
||||
|
|
||||
</data> |
|
||||
</openerp> |
|
||||
|
</odoo> |
||||
@ -1,26 +1,26 @@ |
|||||
<?xml version="1.0"?> |
<?xml version="1.0"?> |
||||
<openerp> |
|
||||
<data> |
|
||||
<!-- Add cities to the State form --> |
|
||||
<record model="ir.ui.view" id="view_country_state_form2"> |
|
||||
<field name="name">view_country_state_form2</field> |
|
||||
<field name="model">res.country.state</field> |
|
||||
<field name="inherit_id" ref="base.view_country_state_form"/> |
|
||||
<field name="arch" type="xml"> |
|
||||
<field name="country_id" position="after"> |
|
||||
<field name="better_zip_ids" |
|
||||
context="{'country_id': country_id}" |
|
||||
colspan="4" |
|
||||
nolabel="1"> |
|
||||
<tree editable="top"> |
|
||||
<field name="name"/> |
|
||||
<field name="code"/> |
|
||||
<field name="city"/> |
|
||||
<field name="country_id"/> |
|
||||
</tree> |
|
||||
</field> |
|
||||
|
<odoo> |
||||
|
|
||||
|
<!-- Add cities to the State form --> |
||||
|
<record model="ir.ui.view" id="view_country_state_form2"> |
||||
|
<field name="name">view_country_state_form2</field> |
||||
|
<field name="model">res.country.state</field> |
||||
|
<field name="inherit_id" ref="base.view_country_state_form"/> |
||||
|
<field name="arch" type="xml"> |
||||
|
<field name="country_id" position="after"> |
||||
|
<field name="better_zip_ids" |
||||
|
context="{'country_id': country_id}" |
||||
|
colspan="4" |
||||
|
nolabel="1"> |
||||
|
<tree editable="top"> |
||||
|
<field name="name"/> |
||||
|
<field name="code"/> |
||||
|
<field name="city"/> |
||||
|
<field name="country_id"/> |
||||
|
</tree> |
||||
</field> |
</field> |
||||
</field> |
</field> |
||||
</record> |
|
||||
</data> |
|
||||
</openerp> |
|
||||
|
</field> |
||||
|
</record> |
||||
|
|
||||
|
</odoo> |
||||
Write
Preview
Loading…
Cancel
Save
Reference in new issue