[tryton-debian-vcs] tryton-modules-carrier branch upstream updated. upstream/4.0.0-1-g33c680b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Dec 6 15:56:33 UTC 2016
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-carrier.git;a=commitdiff;h=upstream/4.0.0-1-g33c680b
commit 33c680b651d9c5d64be060212e64abc9e61518f6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 5 09:34:21 2016 +0100
Adding upstream version 4.2.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 54685e3..1d62f79 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.2.0 - 2016-11-28
+* Bug fixes (see mercurial logs for details)
+* Add carrier selection
+
Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
* Add Python3 support
diff --git a/COPYRIGHT b/COPYRIGHT
index b8eb554..2d2b387 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
Copyright (C) 2011-2016 Cédric Krier.
Copyright (C) 2011-2013 Bertrand Chenal.
-Copyright (C) 2011-2015 Nicolas Évrard.
+Copyright (C) 2011-2016 Nicolas Évrard.
Copyright (C) 2011-2016 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/INSTALL b/INSTALL
index a71486f..b595a3d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -24,7 +24,7 @@ site-packages directory on your system.
For advanced options, please refer to the easy_install and/or the distutils
documentation:
- http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://setuptools.readthedocs.io/en/latest/easy_install.html
http://docs.python.org/inst/inst.html
To use without installation, extract the archive into ``trytond/modules`` with
diff --git a/PKG-INFO b/PKG-INFO
index ed8650d..b5a30ab 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_carrier
-Version: 4.0.0
+Version: 4.2.0
Summary: Tryton module with carriers
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_carrier
===============
@@ -63,6 +63,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/__init__.py b/__init__.py
index e99acb1..1011354 100644
--- a/__init__.py
+++ b/__init__.py
@@ -3,9 +3,14 @@
from trytond.pool import Pool
from .carrier import *
+from .party import PartyReplace
def register():
Pool.register(
Carrier,
+ CarrierSelection,
module='carrier', type_='model')
+ Pool.register(
+ PartyReplace,
+ module='carrier', type_='wizard')
diff --git a/carrier.py b/carrier.py
index 9d77de8..3730731 100644
--- a/carrier.py
+++ b/carrier.py
@@ -1,10 +1,12 @@
# 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.model import ModelView, ModelSQL, fields
+from trytond.model import ModelView, ModelSQL, MatchMixin, fields, \
+ sequence_ordered
from trytond.transaction import Transaction
from trytond.pool import Pool
+from trytond.cache import Cache
-__all__ = ['Carrier']
+__all__ = ['Carrier', 'CarrierSelection']
class Carrier(ModelSQL, ModelView):
@@ -45,3 +47,75 @@ class Carrier(ModelSQL, ModelView):
user = User(Transaction().user)
return self.carrier_product.cost_price, user.company.currency.id
return 0, None
+
+ @classmethod
+ def create(cls, *args, **kwargs):
+ pool = Pool()
+ CarrierSelection = pool.get('carrier.selection')
+ carriers = super(Carrier, cls).create(*args, **kwargs)
+ CarrierSelection._get_carriers_cache.clear()
+ return carriers
+
+ @classmethod
+ def delete(cls, *args, **kwargs):
+ pool = Pool()
+ CarrierSelection = pool.get('carrier.selection')
+ super(Carrier, cls).delete(*args, **kwargs)
+ CarrierSelection._get_carriers_cache.clear()
+
+
+class CarrierSelection(sequence_ordered(), MatchMixin, ModelSQL, ModelView):
+ 'Carrier Selection'
+ __name__ = 'carrier.selection'
+ _get_carriers_cache = Cache('carrier.selection.get_carriers')
+
+ active = fields.Boolean('Active')
+ from_country = fields.Many2One('country.country', 'From Country',
+ ondelete='RESTRICT')
+ to_country = fields.Many2One('country.country', 'To Country',
+ ondelete='RESTRICT')
+ carrier = fields.Many2One('carrier', 'Carrier', required=True,
+ ondelete='CASCADE')
+
+ @staticmethod
+ def default_active():
+ return True
+
+ @classmethod
+ def create(cls, *args, **kwargs):
+ selections = super(CarrierSelection, cls).create(*args, **kwargs)
+ cls._get_carriers_cache.clear()
+ return selections
+
+ @classmethod
+ def write(cls, *args, **kwargs):
+ super(CarrierSelection, cls).write(*args, **kwargs)
+ cls._get_carriers_cache.clear()
+
+ @classmethod
+ def delete(cls, *args, **kwargs):
+ super(CarrierSelection, cls).delete(*args, **kwargs)
+ cls._get_carriers_cache.clear()
+
+ @classmethod
+ def get_carriers(cls, pattern):
+ pool = Pool()
+ Carrier = pool.get('carrier')
+
+ key = tuple(sorted(pattern.iteritems()))
+ carriers = cls._get_carriers_cache.get(key)
+ if carriers is not None:
+ return Carrier.browse(carriers)
+
+ carriers = []
+ selections = cls.search([])
+ if not selections:
+ with Transaction().set_context(active_test=False):
+ carriers = Carrier.search([])
+ else:
+ for selection in selections:
+ if selection.match(pattern):
+ carriers.append(selection.carrier)
+
+ cls._get_carriers_cache.set(key, map(int, carriers))
+ return carriers
diff --git a/carrier.xml b/carrier.xml
index 60955f5..501e174 100644
--- a/carrier.xml
+++ b/carrier.xml
@@ -68,5 +68,52 @@ this repository contains the full copyright notices and license terms. -->
<field name="perm_delete" eval="True"/>
</record>
+ <record model="ir.ui.view" id="carrier_selection_view_form">
+ <field name="model">carrier.selection</field>
+ <field name="type">form</field>
+ <field name="name">selection_form</field>
+ </record>
+ <record model="ir.ui.view" id="carrier_selection_view_list">
+ <field name="model">carrier.selection</field>
+ <field name="type">tree</field>
+ <field name="name">selection_tree</field>
+ </record>
+
+ <record model="ir.action.act_window" id="act_carrier_selection_form">
+ <field name="name">Carrier Selection</field>
+ <field name="res_model">carrier.selection</field>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_carrier_selection_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="carrier_selection_view_list"/>
+ <field name="act_window" ref="act_carrier_selection_form"/>
+ </record>
+ <record model="ir.action.act_window.view"
+ id="act_carrier_selection_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="carrier_selection_view_form"/>
+ <field name="act_window" ref="act_carrier_selection_form"/>
+ </record>
+ <menuitem parent="menu_carrier" action="act_carrier_selection_form"
+ id="menu_carrier_selection"/>
+
+ <record model="ir.model.access" id="access_carrier_selection">
+ <field name="model" search="[('model', '=', 'carrier.selection')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access"
+ id="access_carrier_selection_carrier_admin">
+ <field name="model" search="[('model', '=', 'carrier.selection')]"/>
+ <field name="group" ref="group_carrier_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
</data>
</tryton>
diff --git a/doc/index.rst b/doc/index.rst
index b359b27..c3e049a 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -13,3 +13,17 @@ A carrier links a party with a product and cost method.
there is only the *Product Price* method which takes the *List Price* of the
*Product* as sale price and the *Cost Price* of the *Product* as purchase
price.
+
+
+Carrier Selection
+*****************
+
+A carrier selection defines the country of origin and destination where a
+carrier can deliver the products.
+
+- The *Sequence* is used to order the Carrier Selections.
+- *Active* allows to disable a Carrier Selection.
+- *From Country* defines the Country of origin for this Carrier Selection.
+ Empty value act as a wildcard.
+- *To Country* defins the Country of destination for this Carrier Selection.
+ Empty value act as a wildcard.
diff --git a/locale/bg_BG.po b/locale/bg.po
similarity index 56%
rename from locale/bg_BG.po
rename to locale/bg.po
index 0d10293..deb1050 100644
--- a/locale/bg_BG.po
+++ b/locale/bg.po
@@ -38,6 +38,59 @@ msgctxt "field:carrier,write_uid:"
msgid "Write User"
msgstr "Променено от"
+#, fuzzy
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "Активен"
+
+#, fuzzy
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr "Управление на превозвачи"
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Условие за плащане"
+
+#, fuzzy
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "Последователност"
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
msgstr "Метод за излисляване на разходи за превоз"
@@ -47,10 +100,18 @@ msgctxt "model:carrier,name:"
msgid "Carrier"
msgstr "Превозвач"
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr "Превозвачи"
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr ""
+
#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
@@ -60,6 +121,10 @@ msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
msgstr "Превозвачи"
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
msgstr "Управление на превози"
@@ -68,6 +133,10 @@ msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr "Цена на продукт"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
+msgstr ""
+
msgctxt "view:carrier:"
msgid "Carrier"
msgstr "Превозвач"
diff --git a/locale/ca_ES.po b/locale/ca.po
similarity index 50%
rename from locale/ca_ES.po
rename to locale/ca.po
index 5adc997..d251da3 100644
--- a/locale/ca_ES.po
+++ b/locale/ca.po
@@ -12,11 +12,11 @@ msgstr "Producte del transportista"
msgctxt "field:carrier,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de creació"
msgctxt "field:carrier,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Usuari de creació"
msgctxt "field:carrier,id:"
msgid "ID"
@@ -32,11 +32,55 @@ msgstr "Nom"
msgctxt "field:carrier,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de modificació"
msgctxt "field:carrier,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Usuari de modificació"
+
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "Actiu"
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr "Transportista"
+
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr "Des del país"
+
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "Seqüència"
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr "Cap al país"
+
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
@@ -46,10 +90,18 @@ msgctxt "model:carrier,name:"
msgid "Carrier"
msgstr "Transportista"
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr "Selecció del transportista"
+
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr "Transportistes"
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr "Selecció del transportista"
+
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
msgstr "Transportista"
@@ -58,6 +110,10 @@ msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
msgstr "Transportistes"
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr "Selecció del transportista"
+
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
msgstr "Administració de transportistes"
@@ -66,6 +122,10 @@ msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr "Preu producte"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
+msgstr "Criteri"
+
msgctxt "view:carrier:"
msgid "Carrier"
msgstr "Transportista"
diff --git a/locale/cs_CZ.po b/locale/cs.po
similarity index 52%
rename from locale/cs_CZ.po
rename to locale/cs.po
index b6b741e..126fffe 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs.po
@@ -26,9 +26,10 @@ msgctxt "field:carrier,party:"
msgid "Party"
msgstr ""
+#, fuzzy
msgctxt "field:carrier,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Namu"
msgctxt "field:carrier,write_date:"
msgid "Write Date"
@@ -38,6 +39,51 @@ msgctxt "field:carrier,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr ""
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr ""
+
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr ""
+
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr ""
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr ""
+
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
msgstr ""
@@ -46,10 +92,18 @@ msgctxt "model:carrier,name:"
msgid "Carrier"
msgstr ""
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr ""
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
msgstr ""
@@ -58,6 +112,10 @@ msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
msgstr ""
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
msgstr ""
@@ -66,10 +124,6 @@ msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr ""
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carriers"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de.po
similarity index 54%
rename from locale/de_DE.po
rename to locale/de.po
index f712136..f4cda19 100644
--- a/locale/de_DE.po
+++ b/locale/de.po
@@ -38,6 +38,50 @@ msgctxt "field:carrier,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "Aktiv"
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr "Frachtführer"
+
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr "Ursprungsland"
+
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "Reihenfolge"
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr "Bestimmungsland"
+
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
msgstr "Methode für die Berechnung der Frachtkosten"
@@ -46,10 +90,18 @@ msgctxt "model:carrier,name:"
msgid "Carrier"
msgstr "Frachtführer"
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr "Zuordnung Frachtführer"
+
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr "Frachtführer"
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr "Zuordnung Frachtführer"
+
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
msgstr "Frachtführer"
@@ -58,6 +110,10 @@ msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
msgstr "Frachtführer"
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr "Zuordnung Frachtführer"
+
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
msgstr "Frachtführer Administration"
@@ -66,6 +122,10 @@ msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr "Variantenpreis"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
+msgstr "Kriterien"
+
msgctxt "view:carrier:"
msgid "Carrier"
msgstr "Frachtführer"
diff --git a/locale/es_ES.po b/locale/es.po
similarity index 50%
rename from locale/es_ES.po
rename to locale/es.po
index 1dffddd..a4b388d 100644
--- a/locale/es_ES.po
+++ b/locale/es.po
@@ -12,11 +12,11 @@ msgstr "Producto del transportista"
msgctxt "field:carrier,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
msgctxt "field:carrier,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Usuario de creación"
msgctxt "field:carrier,id:"
msgid "ID"
@@ -32,11 +32,55 @@ msgstr "Nombre"
msgctxt "field:carrier,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
msgctxt "field:carrier,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Usuario de modificación"
+
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "Activo"
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr "Transportista"
+
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr "Desde el país"
+
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr "Hacia el país"
+
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
@@ -46,10 +90,18 @@ msgctxt "model:carrier,name:"
msgid "Carrier"
msgstr "Transportista"
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr "Selección del transportista"
+
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr "Transportistas"
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr "Selección del transportista"
+
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
msgstr "Transportista"
@@ -58,6 +110,10 @@ msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
msgstr "Transportistas"
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr "Selección del transportista"
+
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
msgstr "Administración de transportistas"
@@ -66,6 +122,10 @@ msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr "Precio del producto"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
+msgstr "Criterio"
+
msgctxt "view:carrier:"
msgid "Carrier"
msgstr "Transportista"
diff --git a/locale/es_419.po b/locale/es_419.po
new file mode 100644
index 0000000..227322c
--- /dev/null
+++ b/locale/es_419.po
@@ -0,0 +1,127 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:carrier,carrier_cost_method:"
+msgid "Carrier Cost Method"
+msgstr "Método de costo del transportista"
+
+msgctxt "field:carrier,carrier_product:"
+msgid "Carrier Product"
+msgstr ""
+
+msgctxt "field:carrier,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:carrier,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:carrier,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:carrier,party:"
+msgid "Party"
+msgstr ""
+
+msgctxt "field:carrier,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:carrier,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:carrier,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr ""
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr ""
+
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr ""
+
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr ""
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr ""
+
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
+msgctxt "help:carrier,carrier_cost_method:"
+msgid "Method to compute carrier cost"
+msgstr "Método para calcular el costo del transportista"
+
+msgctxt "model:carrier,name:"
+msgid "Carrier"
+msgstr ""
+
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_carrier_form"
+msgid "Carriers"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_carrier"
+msgid "Carrier"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_carrier_form"
+msgid "Carriers"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr ""
+
+msgctxt "model:res.group,name:group_carrier_admin"
+msgid "Carrier Administration"
+msgstr ""
+
+msgctxt "selection:carrier,carrier_cost_method:"
+msgid "Product Price"
+msgstr ""
+
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
+msgstr ""
diff --git a/locale/es_AR.po b/locale/es_AR.po
deleted file mode 100644
index 5a38ff9..0000000
--- a/locale/es_AR.po
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:carrier,carrier_cost_method:"
-msgid "Carrier Cost Method"
-msgstr "Método costo de transportista"
-
-msgctxt "field:carrier,carrier_product:"
-msgid "Carrier Product"
-msgstr "Producto del transportista"
-
-msgctxt "field:carrier,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:carrier,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:carrier,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:carrier,party:"
-msgid "Party"
-msgstr "Entidad"
-
-msgctxt "field:carrier,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:carrier,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:carrier,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "help:carrier,carrier_cost_method:"
-msgid "Method to compute carrier cost"
-msgstr "Método para procesar el costo del transportista"
-
-msgctxt "model:carrier,name:"
-msgid "Carrier"
-msgstr "Transportista"
-
-msgctxt "model:ir.action,name:act_carrier_form"
-msgid "Carriers"
-msgstr "Transportistas"
-
-msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier"
-msgstr "Transportistas"
-
-msgctxt "model:ir.ui.menu,name:menu_carrier_form"
-msgid "Carriers"
-msgstr "Transportistas"
-
-msgctxt "model:res.group,name:group_carrier_admin"
-msgid "Carrier Administration"
-msgstr "Administración de transportista"
-
-msgctxt "selection:carrier,carrier_cost_method:"
-msgid "Product Price"
-msgstr "Precio del producto"
-
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr "Transportista"
-
-msgctxt "view:carrier:"
-msgid "Carriers"
-msgstr "Transportistas"
diff --git a/locale/es_CO.po b/locale/es_CO.po
deleted file mode 100644
index 901fe59..0000000
--- a/locale/es_CO.po
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:carrier,carrier_cost_method:"
-msgid "Carrier Cost Method"
-msgstr "Método de Costo de Transporte"
-
-msgctxt "field:carrier,carrier_product:"
-msgid "Carrier Product"
-msgstr "Transportador de Producto"
-
-msgctxt "field:carrier,create_date:"
-msgid "Create Date"
-msgstr "Fecha de Creación"
-
-msgctxt "field:carrier,create_uid:"
-msgid "Create User"
-msgstr "Creado por Usuario"
-
-msgctxt "field:carrier,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:carrier,party:"
-msgid "Party"
-msgstr "Tercero"
-
-msgctxt "field:carrier,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:carrier,write_date:"
-msgid "Write Date"
-msgstr "Fecha de Modificación"
-
-msgctxt "field:carrier,write_uid:"
-msgid "Write User"
-msgstr "Modificado por Usuario"
-
-msgctxt "help:carrier,carrier_cost_method:"
-msgid "Method to compute carrier cost"
-msgstr "Método de calculo de costo de transporte"
-
-msgctxt "model:carrier,name:"
-msgid "Carrier"
-msgstr "Transportadora"
-
-msgctxt "model:ir.action,name:act_carrier_form"
-msgid "Carriers"
-msgstr "Transportadores"
-
-msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier"
-msgstr "Transportadora"
-
-msgctxt "model:ir.ui.menu,name:menu_carrier_form"
-msgid "Carriers"
-msgstr "Transportadores"
-
-msgctxt "model:res.group,name:group_carrier_admin"
-msgid "Carrier Administration"
-msgstr "Administración Transporte"
-
-msgctxt "selection:carrier,carrier_cost_method:"
-msgid "Product Price"
-msgstr "Precio de Producto"
-
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr "Transportadora"
-
-msgctxt "view:carrier:"
-msgid "Carriers"
-msgstr "Transportadoras"
diff --git a/locale/es_EC.po b/locale/es_EC.po
deleted file mode 100644
index 6b5a85d..0000000
--- a/locale/es_EC.po
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:carrier,carrier_cost_method:"
-msgid "Carrier Cost Method"
-msgstr "Método de costo del transportista"
-
-msgctxt "field:carrier,carrier_product:"
-msgid "Carrier Product"
-msgstr "Producto del transportista"
-
-msgctxt "field:carrier,create_date:"
-msgid "Create Date"
-msgstr "Fecha de creación"
-
-msgctxt "field:carrier,create_uid:"
-msgid "Create User"
-msgstr "Creado por usuario"
-
-msgctxt "field:carrier,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:carrier,party:"
-msgid "Party"
-msgstr "Tercero"
-
-msgctxt "field:carrier,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:carrier,write_date:"
-msgid "Write Date"
-msgstr "Fecha de modificación"
-
-msgctxt "field:carrier,write_uid:"
-msgid "Write User"
-msgstr "Modificado por usuario"
-
-msgctxt "help:carrier,carrier_cost_method:"
-msgid "Method to compute carrier cost"
-msgstr "Método para calcular el costo del transportista"
-
-msgctxt "model:carrier,name:"
-msgid "Carrier"
-msgstr "Transportista"
-
-msgctxt "model:ir.action,name:act_carrier_form"
-msgid "Carriers"
-msgstr "Transportistas"
-
-msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier"
-msgstr "Transportista"
-
-msgctxt "model:ir.ui.menu,name:menu_carrier_form"
-msgid "Carriers"
-msgstr "Transportistas"
-
-msgctxt "model:res.group,name:group_carrier_admin"
-msgid "Carrier Administration"
-msgstr "Administración de Transportistas"
-
-msgctxt "selection:carrier,carrier_cost_method:"
-msgid "Product Price"
-msgstr "Precio del producto"
-
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr "Transportista"
-
-msgctxt "view:carrier:"
-msgid "Carriers"
-msgstr "Transportistas"
diff --git a/locale/es_MX.po b/locale/es_MX.po
deleted file mode 100644
index 63c7238..0000000
--- a/locale/es_MX.po
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:carrier,carrier_cost_method:"
-msgid "Carrier Cost Method"
-msgstr "Método costo del transporte"
-
-msgctxt "field:carrier,carrier_product:"
-msgid "Carrier Product"
-msgstr "Producto del transporte"
-
-msgctxt "field:carrier,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:carrier,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:carrier,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:carrier,party:"
-msgid "Party"
-msgstr "Entidad"
-
-msgctxt "field:carrier,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:carrier,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:carrier,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "help:carrier,carrier_cost_method:"
-msgid "Method to compute carrier cost"
-msgstr "Método para calcular el costo del transporte."
-
-msgctxt "model:carrier,name:"
-msgid "Carrier"
-msgstr "Transporte"
-
-msgctxt "model:ir.action,name:act_carrier_form"
-msgid "Carriers"
-msgstr "Transportes"
-
-msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier"
-msgstr "Transporte"
-
-msgctxt "model:ir.ui.menu,name:menu_carrier_form"
-msgid "Carriers"
-msgstr "Transportes"
-
-msgctxt "model:res.group,name:group_carrier_admin"
-msgid "Carrier Administration"
-msgstr "Administración de transportes"
-
-msgctxt "selection:carrier,carrier_cost_method:"
-msgid "Product Price"
-msgstr "Precio del producto"
-
-#, fuzzy
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr "Transporte"
-
-#, fuzzy
-msgctxt "view:carrier:"
-msgid "Carriers"
-msgstr "Transportes"
diff --git a/locale/fr_FR.po b/locale/fr.po
similarity index 54%
rename from locale/fr_FR.po
rename to locale/fr.po
index 2401478..1e5385b 100644
--- a/locale/fr_FR.po
+++ b/locale/fr.po
@@ -38,6 +38,50 @@ msgctxt "field:carrier,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "Active"
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr "Transporteur"
+
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr "Du pays"
+
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "Séquence"
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr "Vers le pays"
+
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
msgstr "Méthode de calcul de coût de transport"
@@ -46,10 +90,18 @@ msgctxt "model:carrier,name:"
msgid "Carrier"
msgstr "Transporteur"
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr "Choix de transporteurs"
+
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr "Transporteurs"
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr "Choix de transporteurs"
+
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
msgstr "Transporteurs"
@@ -58,6 +110,10 @@ msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
msgstr "Transporteurs"
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr "Choix de transporteurs"
+
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
msgstr "Administration des transporteurs"
@@ -66,6 +122,10 @@ msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr "Prix du produit"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
+msgstr "Critères"
+
msgctxt "view:carrier:"
msgid "Carrier"
msgstr "Transporteur"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index b6b741e..046fd18 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -10,34 +10,93 @@ msgctxt "field:carrier,carrier_product:"
msgid "Carrier Product"
msgstr ""
+#, fuzzy
msgctxt "field:carrier,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Létrehozás détuma"
+#, fuzzy
msgctxt "field:carrier,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Által létrehozva "
+#, fuzzy
msgctxt "field:carrier,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
+#, fuzzy
msgctxt "field:carrier,party:"
msgid "Party"
-msgstr ""
+msgstr "Partner"
+#, fuzzy
msgctxt "field:carrier,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Név"
+#, fuzzy
msgctxt "field:carrier,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "utolsó módosítás dátuma"
+#, fuzzy
msgctxt "field:carrier,write_uid:"
msgid "Write User"
+msgstr "Által módosítva"
+
+#, fuzzy
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "Aktív"
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás détuma"
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva "
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Név"
+
+#, fuzzy
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "Számkör"
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
msgstr ""
+#, fuzzy
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "utolsó módosítás dátuma"
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
msgstr ""
@@ -46,10 +105,18 @@ msgctxt "model:carrier,name:"
msgid "Carrier"
msgstr ""
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr ""
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
msgstr ""
@@ -58,6 +125,10 @@ msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
msgstr ""
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
msgstr ""
@@ -66,10 +137,6 @@ msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr ""
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carriers"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index b6b741e..1b78707 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -4,72 +4,132 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_method:"
msgid "Carrier Cost Method"
-msgstr ""
+msgstr "Gestione del costo Vettore"
msgctxt "field:carrier,carrier_product:"
msgid "Carrier Product"
-msgstr ""
+msgstr "Prodotto vettore"
msgctxt "field:carrier,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creazione"
msgctxt "field:carrier,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Crea utente"
msgctxt "field:carrier,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:carrier,party:"
msgid "Party"
-msgstr ""
+msgstr "Controparte"
msgctxt "field:carrier,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Nome"
msgctxt "field:carrier,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data scrittura"
msgctxt "field:carrier,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "modificato da"
+
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "Attivo"
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr "Vettore"
+
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "creato il"
+
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "creato da"
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr "da Paese"
+
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "Sequenza"
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr "a Paese"
+
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "modificato il"
+
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "modificato da"
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
-msgstr ""
+msgstr "Metodo per calcolare il costo di trasporto"
msgctxt "model:carrier,name:"
msgid "Carrier"
-msgstr ""
+msgstr "Vettore"
+
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr "scelta vettore"
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
-msgstr ""
+msgstr "Vettori"
+
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr "scelta vettore"
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
-msgstr ""
+msgstr "Vettore"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
-msgstr ""
+msgstr "Vettori"
+
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr "scelta vettore"
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
-msgstr ""
+msgstr "Gestione Vettore"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
-msgstr ""
+msgstr "Prezzo del prodotto"
+
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
+msgstr "Criteri"
msgctxt "view:carrier:"
msgid "Carrier"
-msgstr ""
+msgstr "Vettore"
msgctxt "view:carrier:"
msgid "Carriers"
-msgstr ""
+msgstr "Vettori"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index b6b741e..bc80a65 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -38,38 +38,93 @@ msgctxt "field:carrier,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr "Carrier"
+
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr ""
+
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr ""
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr ""
+
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
msgstr ""
+#, fuzzy
msgctxt "model:carrier,name:"
msgid "Carrier"
-msgstr ""
+msgstr "Carrier"
+
+#, fuzzy
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr "Carrier Selection"
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
-msgstr ""
+msgstr "Carriers"
+
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr "Carrier Selection"
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
-msgstr ""
+msgstr "Carrier"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
-msgstr ""
+msgstr "Carriers"
+
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr "Carrier Selection"
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
-msgstr ""
+msgstr "Carrier Administration"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr ""
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carriers"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
msgstr ""
diff --git a/locale/lo.po b/locale/lo.po
new file mode 100644
index 0000000..9eddae3
--- /dev/null
+++ b/locale/lo.po
@@ -0,0 +1,144 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:carrier,carrier_cost_method:"
+msgid "Carrier Cost Method"
+msgstr ""
+
+msgctxt "field:carrier,carrier_product:"
+msgid "Carrier Product"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier,create_date:"
+msgid "Create Date"
+msgstr "ສ້າງວັນທີ"
+
+#, fuzzy
+msgctxt "field:carrier,create_uid:"
+msgid "Create User"
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
+
+#, fuzzy
+msgctxt "field:carrier,id:"
+msgid "ID"
+msgstr "ເລດລຳດັບ"
+
+#, fuzzy
+msgctxt "field:carrier,party:"
+msgid "Party"
+msgstr "ພາກສ່ວນ"
+
+#, fuzzy
+msgctxt "field:carrier,rec_name:"
+msgid "Name"
+msgstr "ຊື່"
+
+#, fuzzy
+msgctxt "field:carrier,write_date:"
+msgid "Write Date"
+msgstr "ວັນທີບັນທຶກ"
+
+#, fuzzy
+msgctxt "field:carrier,write_uid:"
+msgid "Write User"
+msgstr "ສ້າງຜູ້ໃຊ້"
+
+#, fuzzy
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "ໃຊ້ຢູ່"
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "ສ້າງວັນທີ"
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
+
+#, fuzzy
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr "ຈາກປະເທດ"
+
+#, fuzzy
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "ເລດລຳດັບ"
+
+#, fuzzy
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "ຊື່"
+
+#, fuzzy
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "ລໍາດັບ"
+
+#, fuzzy
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr "ເຖິງປະເທດ"
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "ວັນທີບັນທຶກ"
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "ສ້າງຜູ້ໃຊ້"
+
+msgctxt "help:carrier,carrier_cost_method:"
+msgid "Method to compute carrier cost"
+msgstr ""
+
+msgctxt "model:carrier,name:"
+msgid "Carrier"
+msgstr ""
+
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_carrier_form"
+msgid "Carriers"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_carrier"
+msgid "Carrier"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_carrier_form"
+msgid "Carriers"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr ""
+
+msgctxt "model:res.group,name:group_carrier_admin"
+msgid "Carrier Administration"
+msgstr ""
+
+msgctxt "selection:carrier,carrier_cost_method:"
+msgid "Product Price"
+msgstr ""
+
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
+msgstr ""
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
deleted file mode 100644
index b6b741e..0000000
--- a/locale/lo_LA.po
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:carrier,carrier_cost_method:"
-msgid "Carrier Cost Method"
-msgstr ""
-
-msgctxt "field:carrier,carrier_product:"
-msgid "Carrier Product"
-msgstr ""
-
-msgctxt "field:carrier,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:carrier,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:carrier,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:carrier,party:"
-msgid "Party"
-msgstr ""
-
-msgctxt "field:carrier,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt "field:carrier,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:carrier,write_uid:"
-msgid "Write User"
-msgstr ""
-
-msgctxt "help:carrier,carrier_cost_method:"
-msgid "Method to compute carrier cost"
-msgstr ""
-
-msgctxt "model:carrier,name:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_carrier_form"
-msgid "Carriers"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_carrier_form"
-msgid "Carriers"
-msgstr ""
-
-msgctxt "model:res.group,name:group_carrier_admin"
-msgid "Carrier Administration"
-msgstr ""
-
-msgctxt "selection:carrier,carrier_cost_method:"
-msgid "Product Price"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carriers"
-msgstr ""
diff --git a/locale/it_IT.po b/locale/lt.po
similarity index 52%
copy from locale/it_IT.po
copy to locale/lt.po
index b6b741e..126fffe 100644
--- a/locale/it_IT.po
+++ b/locale/lt.po
@@ -26,9 +26,10 @@ msgctxt "field:carrier,party:"
msgid "Party"
msgstr ""
+#, fuzzy
msgctxt "field:carrier,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Namu"
msgctxt "field:carrier,write_date:"
msgid "Write Date"
@@ -38,6 +39,51 @@ msgctxt "field:carrier,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr ""
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr ""
+
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr ""
+
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr ""
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr ""
+
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
msgstr ""
@@ -46,10 +92,18 @@ msgctxt "model:carrier,name:"
msgid "Carrier"
msgstr ""
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr ""
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
msgstr ""
@@ -58,6 +112,10 @@ msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
msgstr ""
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
msgstr ""
@@ -66,10 +124,6 @@ msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr ""
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carriers"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
msgstr ""
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
deleted file mode 100644
index b6b741e..0000000
--- a/locale/lt_LT.po
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:carrier,carrier_cost_method:"
-msgid "Carrier Cost Method"
-msgstr ""
-
-msgctxt "field:carrier,carrier_product:"
-msgid "Carrier Product"
-msgstr ""
-
-msgctxt "field:carrier,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:carrier,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:carrier,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:carrier,party:"
-msgid "Party"
-msgstr ""
-
-msgctxt "field:carrier,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt "field:carrier,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:carrier,write_uid:"
-msgid "Write User"
-msgstr ""
-
-msgctxt "help:carrier,carrier_cost_method:"
-msgid "Method to compute carrier cost"
-msgstr ""
-
-msgctxt "model:carrier,name:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_carrier_form"
-msgid "Carriers"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_carrier_form"
-msgid "Carriers"
-msgstr ""
-
-msgctxt "model:res.group,name:group_carrier_admin"
-msgid "Carrier Administration"
-msgstr ""
-
-msgctxt "selection:carrier,carrier_cost_method:"
-msgid "Product Price"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carriers"
-msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
new file mode 100644
index 0000000..a7fa60f
--- /dev/null
+++ b/locale/nl.po
@@ -0,0 +1,142 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:carrier,carrier_cost_method:"
+msgid "Carrier Cost Method"
+msgstr ""
+
+msgctxt "field:carrier,carrier_product:"
+msgid "Carrier Product"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier,create_date:"
+msgid "Create Date"
+msgstr "Datum"
+
+#, fuzzy
+msgctxt "field:carrier,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+#, fuzzy
+msgctxt "field:carrier,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:carrier,party:"
+msgid "Party"
+msgstr "Relaties"
+
+#, fuzzy
+msgctxt "field:carrier,rec_name:"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:carrier,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#, fuzzy
+msgctxt "field:carrier,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
+#, fuzzy
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "Actief"
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "Datum"
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "Reeks"
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
+msgctxt "help:carrier,carrier_cost_method:"
+msgid "Method to compute carrier cost"
+msgstr ""
+
+msgctxt "model:carrier,name:"
+msgid "Carrier"
+msgstr ""
+
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_carrier_form"
+msgid "Carriers"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_carrier"
+msgid "Carrier"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_carrier_form"
+msgid "Carriers"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr ""
+
+msgctxt "model:res.group,name:group_carrier_admin"
+msgid "Carrier Administration"
+msgstr ""
+
+msgctxt "selection:carrier,carrier_cost_method:"
+msgid "Product Price"
+msgstr ""
+
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
+msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
deleted file mode 100644
index ebaaaad..0000000
--- a/locale/nl_NL.po
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:carrier,carrier_cost_method:"
-msgid "Carrier Cost Method"
-msgstr ""
-
-msgctxt "field:carrier,carrier_product:"
-msgid "Carrier Product"
-msgstr ""
-
-msgctxt "field:carrier,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:carrier,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:carrier,id:"
-msgid "ID"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:carrier,party:"
-msgid "Party"
-msgstr "Relaties"
-
-#, fuzzy
-msgctxt "field:carrier,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
-
-msgctxt "field:carrier,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:carrier,write_uid:"
-msgid "Write User"
-msgstr ""
-
-msgctxt "help:carrier,carrier_cost_method:"
-msgid "Method to compute carrier cost"
-msgstr ""
-
-msgctxt "model:carrier,name:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_carrier_form"
-msgid "Carriers"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_carrier_form"
-msgid "Carriers"
-msgstr ""
-
-msgctxt "model:res.group,name:group_carrier_admin"
-msgid "Carrier Administration"
-msgstr ""
-
-msgctxt "selection:carrier,carrier_cost_method:"
-msgid "Product Price"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carriers"
-msgstr ""
diff --git a/locale/it_IT.po b/locale/pl.po
similarity index 50%
copy from locale/it_IT.po
copy to locale/pl.po
index b6b741e..bc80a65 100644
--- a/locale/it_IT.po
+++ b/locale/pl.po
@@ -38,38 +38,93 @@ msgctxt "field:carrier,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr "Carrier"
+
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr ""
+
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr ""
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr ""
+
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
msgstr ""
+#, fuzzy
msgctxt "model:carrier,name:"
msgid "Carrier"
-msgstr ""
+msgstr "Carrier"
+
+#, fuzzy
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr "Carrier Selection"
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
-msgstr ""
+msgstr "Carriers"
+
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr "Carrier Selection"
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
-msgstr ""
+msgstr "Carrier"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
-msgstr ""
+msgstr "Carriers"
+
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr "Carrier Selection"
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
-msgstr ""
+msgstr "Carrier Administration"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr ""
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carriers"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 36e4fdd..8399894 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -38,6 +38,61 @@ msgctxt "field:carrier,write_uid:"
msgid "Write User"
msgstr "Criado por"
+#, fuzzy
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "Ativo"
+
+#, fuzzy
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr "Transportadora"
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "Usuário de Criação"
+
+#, fuzzy
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr "País de Origem"
+
+#, fuzzy
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+#, fuzzy
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "Sequência"
+
+#, fuzzy
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr "País de Destino"
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "Editado por"
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "Gravado por"
+
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
msgstr "Método para computar o custo da transportadora"
@@ -46,10 +101,18 @@ msgctxt "model:carrier,name:"
msgid "Carrier"
msgstr "Transportadora"
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr "Transportadoras"
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
msgstr "Transportadora"
@@ -58,6 +121,10 @@ msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
msgstr "Transportadoras"
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
msgstr "Administração de transportadora"
@@ -66,6 +133,10 @@ msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr "Preço do produto"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
+msgstr ""
+
msgctxt "view:carrier:"
msgid "Carrier"
msgstr "Transportadora"
diff --git a/locale/ru_RU.po b/locale/ru.po
similarity index 51%
rename from locale/ru_RU.po
rename to locale/ru.po
index 571c250..2ce0097 100644
--- a/locale/ru_RU.po
+++ b/locale/ru.po
@@ -45,6 +45,58 @@ msgctxt "field:carrier,write_uid:"
msgid "Write User"
msgstr "Изменено пользователем"
+#, fuzzy
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "Действующий"
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Правило оплаты"
+
+#, fuzzy
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "Последовательность"
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
msgstr ""
@@ -53,10 +105,18 @@ msgctxt "model:carrier,name:"
msgid "Carrier"
msgstr ""
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr ""
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
msgstr ""
@@ -65,6 +125,10 @@ msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
msgstr ""
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
msgstr ""
@@ -73,10 +137,6 @@ msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr ""
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carriers"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
msgstr ""
diff --git a/locale/sl_SI.po b/locale/sl.po
similarity index 54%
rename from locale/sl_SI.po
rename to locale/sl.po
index 0673ee3..ba51911 100644
--- a/locale/sl_SI.po
+++ b/locale/sl.po
@@ -38,6 +38,59 @@ msgctxt "field:carrier,write_uid:"
msgid "Write User"
msgstr "Zapisal"
+#, fuzzy
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "Aktivno"
+
+#, fuzzy
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr "Špediter"
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+#, fuzzy
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
+msgstr "Iz države"
+
+#, fuzzy
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "Zap.št."
+
+#, fuzzy
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr "V državo"
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
msgstr "Način izračuna špedicijskih stroškov"
@@ -46,10 +99,18 @@ msgctxt "model:carrier,name:"
msgid "Carrier"
msgstr "Špediter"
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr "Špediterji"
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
msgstr "Špedicija"
@@ -58,6 +119,10 @@ msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
msgstr "Špediterji"
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
msgstr "Špedicija"
@@ -66,6 +131,10 @@ msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr "Cena izdelka"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
+msgstr ""
+
msgctxt "view:carrier:"
msgid "Carrier"
msgstr "Špediter"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index b6b741e..6293ee4 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -10,34 +10,92 @@ msgctxt "field:carrier,carrier_product:"
msgid "Carrier Product"
msgstr ""
+#, fuzzy
msgctxt "field:carrier,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "创建日期:"
+#, fuzzy
msgctxt "field:carrier,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "添加用户"
+#, fuzzy
msgctxt "field:carrier,id:"
msgid "ID"
-msgstr ""
+msgstr "编号"
msgctxt "field:carrier,party:"
msgid "Party"
msgstr ""
+#, fuzzy
msgctxt "field:carrier,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "纳木"
+#, fuzzy
msgctxt "field:carrier,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "写入日期"
+#, fuzzy
msgctxt "field:carrier,write_uid:"
msgid "Write User"
+msgstr "写入帐号"
+
+#, fuzzy
+msgctxt "field:carrier.selection,active:"
+msgid "Active"
+msgstr "启用"
+
+msgctxt "field:carrier.selection,carrier:"
+msgid "Carrier"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_date:"
+msgid "Create Date"
+msgstr "创建日期:"
+
+#, fuzzy
+msgctxt "field:carrier.selection,create_uid:"
+msgid "Create User"
+msgstr "添加用户"
+
+msgctxt "field:carrier.selection,from_country:"
+msgid "From Country"
msgstr ""
+#, fuzzy
+msgctxt "field:carrier.selection,id:"
+msgid "ID"
+msgstr "编号"
+
+#, fuzzy
+msgctxt "field:carrier.selection,rec_name:"
+msgid "Name"
+msgstr "纳木"
+
+#, fuzzy
+msgctxt "field:carrier.selection,sequence:"
+msgid "Sequence"
+msgstr "序列"
+
+msgctxt "field:carrier.selection,to_country:"
+msgid "To Country"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_date:"
+msgid "Write Date"
+msgstr "写入日期"
+
+#, fuzzy
+msgctxt "field:carrier.selection,write_uid:"
+msgid "Write User"
+msgstr "写入帐号"
+
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
msgstr ""
@@ -46,10 +104,18 @@ msgctxt "model:carrier,name:"
msgid "Carrier"
msgstr ""
+msgctxt "model:carrier.selection,name:"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr ""
+msgctxt "model:ir.action,name:act_carrier_selection_form"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
msgstr ""
@@ -58,6 +124,10 @@ msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
msgstr ""
+msgctxt "model:ir.ui.menu,name:menu_carrier_selection"
+msgid "Carrier Selection"
+msgstr ""
+
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
msgstr ""
@@ -66,10 +136,6 @@ msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
msgstr ""
-msgctxt "view:carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "view:carrier:"
-msgid "Carriers"
+msgctxt "view:carrier.selection:"
+msgid "Criteria"
msgstr ""
diff --git a/party.py b/party.py
new file mode 100644
index 0000000..4d7184b
--- /dev/null
+++ b/party.py
@@ -0,0 +1,16 @@
+# 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.pool import PoolMeta
+
+__all__ = ['PartyReplace']
+
+
+class PartyReplace:
+ __metaclass__ = PoolMeta
+ __name__ = 'party.replace'
+
+ @classmethod
+ def fields_to_replace(cls):
+ return super(PartyReplace, cls).fields_to_replace() + [
+ ('carrier', 'party'),
+ ]
diff --git a/setup.py b/setup.py
index 3f673bf..df9d8b9 100644
--- a/setup.py
+++ b/setup.py
@@ -90,6 +90,7 @@ setup(name=name,
'Natural Language :: German',
'Natural Language :: Hungarian',
'Natural Language :: Italian',
+ 'Natural Language :: Polish',
'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
diff --git a/tryton.cfg b/tryton.cfg
index 2e566fe..7969fd8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,6 +1,7 @@
[tryton]
-version=4.0.0
+version=4.2.0
depends:
+ country
ir
party
product
diff --git a/trytond_carrier.egg-info/PKG-INFO b/trytond_carrier.egg-info/PKG-INFO
index 3bb2887..80c7786 100644
--- a/trytond_carrier.egg-info/PKG-INFO
+++ b/trytond_carrier.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-carrier
-Version: 4.0.0
+Version: 4.2.0
Summary: Tryton module with carriers
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_carrier
===============
@@ -63,6 +63,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/trytond_carrier.egg-info/SOURCES.txt b/trytond_carrier.egg-info/SOURCES.txt
index dc78760..457093f 100644
--- a/trytond_carrier.egg-info/SOURCES.txt
+++ b/trytond_carrier.egg-info/SOURCES.txt
@@ -10,49 +10,50 @@ tryton.cfg
./__init__.py
./carrier.py
./carrier.xml
+./party.py
./tryton.cfg
-./locale/bg_BG.po
-./locale/ca_ES.po
-./locale/cs_CZ.po
-./locale/de_DE.po
-./locale/es_AR.po
-./locale/es_CO.po
-./locale/es_EC.po
-./locale/es_ES.po
-./locale/es_MX.po
-./locale/fr_FR.po
+./locale/bg.po
+./locale/ca.po
+./locale/cs.po
+./locale/de.po
+./locale/es.po
+./locale/es_419.po
+./locale/fr.po
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
-./locale/lt_LT.po
-./locale/nl_NL.po
+./locale/lo.po
+./locale/lt.po
+./locale/nl.po
+./locale/pl.po
./locale/pt_BR.po
-./locale/ru_RU.po
-./locale/sl_SI.po
+./locale/ru.po
+./locale/sl.po
+./locale/zh_CN.po
./tests/__init__.py
./tests/test_carrier.py
./view/carrier_form.xml
./view/carrier_tree.xml
+./view/selection_form.xml
+./view/selection_tree.xml
doc/index.rst
-locale/bg_BG.po
-locale/ca_ES.po
-locale/cs_CZ.po
-locale/de_DE.po
-locale/es_AR.po
-locale/es_CO.po
-locale/es_EC.po
-locale/es_ES.po
-locale/es_MX.po
-locale/fr_FR.po
+locale/bg.po
+locale/ca.po
+locale/cs.po
+locale/de.po
+locale/es.po
+locale/es_419.po
+locale/fr.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
-locale/lo_LA.po
-locale/lt_LT.po
-locale/nl_NL.po
+locale/lo.po
+locale/lt.po
+locale/nl.po
+locale/pl.po
locale/pt_BR.po
-locale/ru_RU.po
-locale/sl_SI.po
+locale/ru.po
+locale/sl.po
locale/zh_CN.po
trytond_carrier.egg-info/PKG-INFO
trytond_carrier.egg-info/SOURCES.txt
@@ -62,4 +63,6 @@ trytond_carrier.egg-info/not-zip-safe
trytond_carrier.egg-info/requires.txt
trytond_carrier.egg-info/top_level.txt
view/carrier_form.xml
-view/carrier_tree.xml
\ No newline at end of file
+view/carrier_tree.xml
+view/selection_form.xml
+view/selection_tree.xml
\ No newline at end of file
diff --git a/trytond_carrier.egg-info/requires.txt b/trytond_carrier.egg-info/requires.txt
index e04ee8e..f8e4ee7 100644
--- a/trytond_carrier.egg-info/requires.txt
+++ b/trytond_carrier.egg-info/requires.txt
@@ -1,3 +1,4 @@
-trytond_party >= 4.0, < 4.1
-trytond_product >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond_country >= 4.2, < 4.3
+trytond_party >= 4.2, < 4.3
+trytond_product >= 4.2, < 4.3
+trytond >= 4.2, < 4.3
diff --git a/view/carrier_form.xml b/view/carrier_form.xml
index ce5fe64..c8ae1a6 100644
--- a/view/carrier_form.xml
+++ b/view/carrier_form.xml
@@ -1,7 +1,7 @@
<?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. -->
-<form string="Carrier">
+<form>
<label name="party"/>
<field name="party"/>
<newline/>
diff --git a/view/carrier_tree.xml b/view/carrier_tree.xml
index d0c0cb9..c6e9e5b 100644
--- a/view/carrier_tree.xml
+++ b/view/carrier_tree.xml
@@ -1,7 +1,7 @@
<?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. -->
-<tree string="Carriers">
+<tree>
<field name="party"/>
<field name="carrier_product"/>
<field name="carrier_cost_method"/>
diff --git a/view/selection_form.xml b/view/selection_form.xml
new file mode 100644
index 0000000..05984c7
--- /dev/null
+++ b/view/selection_form.xml
@@ -0,0 +1,14 @@
+<?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. -->
+<form>
+ <label name="carrier"/>
+ <field name="carrier"/>
+ <label name="sequence"/>
+ <field name="sequence"/>
+ <separator string="Criteria" id="criteria" colspan="4"/>
+ <label name="from_country"/>
+ <field name="from_country"/>
+ <label name="to_country"/>
+ <field name="to_country"/>
+</form>
diff --git a/view/selection_tree.xml b/view/selection_tree.xml
new file mode 100644
index 0000000..31b6ba9
--- /dev/null
+++ b/view/selection_tree.xml
@@ -0,0 +1,10 @@
+<?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. -->
+<tree editable="bottom"
+ sequence="sequence">
+ <field name="sequence" tree_invisible="1"/>
+ <field name="from_country"/>
+ <field name="to_country"/>
+ <field name="carrier"/>
+</tree>
--
tryton-modules-carrier
More information about the tryton-debian-vcs
mailing list