[tryton-debian-vcs] tryton-modules-carrier branch upstream created. 445f78b49bfaff531ba9635eb4c0b22abed83e77
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:00:21 UTC 2013
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=445f78b49bfaff531ba9635eb4c0b22abed83e77
commit 445f78b49bfaff531ba9635eb4c0b22abed83e77
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:50 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 5c7a6d9..4f015bc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index df30fe4..1d83c64 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_carrier
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module with carriers
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_carrier
=============
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 821b9e4..fc57ef4 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -8,7 +8,7 @@ msgstr "Método de Costo de Transporte"
msgctxt "field:carrier,carrier_product:"
msgid "Carrier Product"
-msgstr "Trasnportador de Producto"
+msgstr "Transportador de Producto"
msgctxt "field:carrier,create_date:"
msgid "Create Date"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 8b77644..ea443be 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -52,7 +52,7 @@ msgstr "Transportistas"
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
-msgstr "Transportistas"
+msgstr "Transportista"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
diff --git a/locale/es_ES.po b/locale/sl_SI.po
similarity index 69%
copy from locale/es_ES.po
copy to locale/sl_SI.po
index 8b77644..a8adb87 100644
--- a/locale/es_ES.po
+++ b/locale/sl_SI.po
@@ -4,19 +4,19 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_method:"
msgid "Carrier Cost Method"
-msgstr "Método coste del transportista"
+msgstr "Obračun špedicijskih stroškov"
msgctxt "field:carrier,carrier_product:"
msgid "Carrier Product"
-msgstr "Producto del transportista"
+msgstr "Izdelek"
msgctxt "field:carrier,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:carrier,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:carrier,id:"
msgid "ID"
@@ -24,52 +24,52 @@ msgstr "ID"
msgctxt "field:carrier,party:"
msgid "Party"
-msgstr "Tercero"
+msgstr "Stranka"
msgctxt "field:carrier,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:carrier,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:carrier,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
-msgstr "Método para calcular el coste del transportista."
+msgstr "Način izračuna špedicijskih stroškov"
msgctxt "model:carrier,name:"
msgid "Carrier"
-msgstr "Transportista"
+msgstr "Špediter"
msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
-msgstr "Transportistas"
+msgstr "Špediterji"
msgctxt "model:ir.ui.menu,name:menu_carrier"
msgid "Carrier"
-msgstr "Transportistas"
+msgstr "Špedicija"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
-msgstr "Transportistas"
+msgstr "Špediterji"
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
-msgstr "Administración de transportista"
+msgstr "Špedicija"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
-msgstr "Precio del producto"
+msgstr "Cena izdelka"
msgctxt "view:carrier:"
msgid "Carrier"
-msgstr "Transportista"
+msgstr "Špediter"
msgctxt "view:carrier:"
msgid "Carriers"
-msgstr "Transportistas"
+msgstr "Špediterji"
diff --git a/setup.py b/setup.py
index 4d6b3ec..00c5171 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_carrier',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 4381a52..94a87d9 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_carrier import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 9b26c5a..79c2613 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
party
diff --git a/trytond_carrier.egg-info/PKG-INFO b/trytond_carrier.egg-info/PKG-INFO
index 9dd7f51..700c0d8 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: 2.8.0
+Version: 3.0.0
Summary: Tryton module with carriers
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_carrier
=============
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_carrier.egg-info/SOURCES.txt b/trytond_carrier.egg-info/SOURCES.txt
index 3592c31..fa44ab3 100644
--- a/trytond_carrier.egg-info/SOURCES.txt
+++ b/trytond_carrier.egg-info/SOURCES.txt
@@ -22,6 +22,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_carrier.egg-info/PKG-INFO
trytond_carrier.egg-info/SOURCES.txt
trytond_carrier.egg-info/dependency_links.txt
diff --git a/trytond_carrier.egg-info/requires.txt b/trytond_carrier.egg-info/requires.txt
index 0dcc8a6..9e4982f 100644
--- a/trytond_carrier.egg-info/requires.txt
+++ b/trytond_carrier.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_party >= 2.8, < 2.9
-trytond_product >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_party >= 3.0, < 3.1
+trytond_product >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit e2f625283806369b21a830d63fab4f0e0c31ed8f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:35:41 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index d3ac7c1..5c7a6d9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 7fcb680..cb2d2c5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2012 Cédric Krier.
-Copyright (C) 2011-2012 Bertrand Chenal.
+Copyright (C) 2011-2013 Cédric Krier.
+Copyright (C) 2011-2013 Bertrand Chenal.
Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2012 B2CK SPRL.
+Copyright (C) 2011-2013 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index 97a9596..2569955 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index f0aa494..df30fe4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_carrier
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module with carriers
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_carrier
=============
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/carrier.py b/carrier.py
index ed84f5d..ab13c6e 100644
--- a/carrier.py
+++ b/carrier.py
@@ -10,7 +10,6 @@ __all__ = ['Carrier']
class Carrier(ModelSQL, ModelView):
'Carrier'
__name__ = 'carrier'
- _inherits = {'party.party': 'party'}
party = fields.Many2One('party.party', 'Party', required=True,
ondelete='CASCADE')
carrier_product = fields.Many2One('product.product', 'Carrier Product',
@@ -29,21 +28,6 @@ class Carrier(ModelSQL, ModelView):
def get_rec_name(self, name):
return '%s - %s' % (self.party.rec_name, self.carrier_product.rec_name)
- @classmethod
- def copy(self, carriers, default=None):
- Party = Pool().get('party.party')
-
- if default is None:
- default = {}
- default = default.copy()
- new_carriers = []
- for carrier in carriers:
- party, = Party.copy([carrier.party])
- default['party'] = party.id
- new_carriers.extend(super(Carrier, self).copy([carrier],
- default=default))
- return new_carriers
-
def get_sale_price(self):
'Compute carrier sale price with currency'
User = Pool().get('res.user')
diff --git a/carrier.xml b/carrier.xml
index 007dcda..1a88c57 100644
--- a/carrier.xml
+++ b/carrier.xml
@@ -15,89 +15,22 @@ this repository contains the full copyright notices and license terms. -->
<field name="group" ref="group_carrier_admin"/>
</record>
- <menuitem name="Carrier Management" sequence="2" id="menu_carrier"/>
+ <menuitem name="Carrier" sequence="2" id="menu_carrier"/>
<record model="ir.ui.view" id="carrier_view_form">
<field name="model">carrier</field>
<field name="type">form</field>
- <field name="inherit" ref="party.party_view_form"/>
+ <field name="inherit" eval="None"/>
<field name="priority">10</field>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/form"
- position="replace_attributes">
- <form string="Carrier"/>
- </xpath>
- <xpath expr="/form/notebook"
- position="inside">
- <page string="Carrier" id="carrier">
- <label name="carrier_product"/>
- <field name="carrier_product"/>
- <newline/>
- <label name="carrier_cost_method"/>
- <field name="carrier_cost_method"/>
- </page>
- </xpath>
- </data>
- ]]>
- </field>
- </record>
-
- <record model="ir.ui.view" id="carrier_view_form2">
- <field name="model">carrier</field>
- <field name="type">form</field>
- <field name="priority">20</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Carrier">
- <label name="party"/>
- <field name="party"/>
- <newline/>
- <label name="carrier_product"/>
- <field name="carrier_product"/>
- <label name="carrier_cost_method"/>
- <field name="carrier_cost_method"/>
- </form>
- ]]>
- </field>
+ <field name="name">carrier_form</field>
</record>
<record model="ir.ui.view" id="carrier_view_tree">
<field name="model">carrier</field>
<field name="type">tree</field>
- <field name="inherit" ref="party.party_view_tree"/>
+ <field name="inherit" eval="None"/>
<field name="priority">10</field>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/tree"
- position="replace_attributes">
- <tree string="Carriers"/>
- </xpath>
- <xpath expr="/tree/field[@name='name']"
- position="after">
- <field name="carrier_product"/>
- <field name="carrier_cost_method"/>
- </xpath>
- </data>
- ]]>
- </field>
- </record>
-
- <record model="ir.ui.view" id="carrier_view_tree2">
- <field name="model">carrier</field>
- <field name="type">tree</field>
- <field name="priority">20</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Carriers">
- <field name="party"/>
- <field name="carrier_product"/>
- <field name="carrier_cost_method"/>
- </tree>
- ]]>
- </field>
+ <field name="name">carrier_tree</field>
</record>
<record model="ir.action.act_window" id="act_carrier_form">
@@ -107,13 +40,13 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window.view"
id="act_carrier_form_view1">
<field name="sequence" eval="10"/>
- <field name="view" ref="carrier_view_tree2"/>
+ <field name="view" ref="carrier_view_tree"/>
<field name="act_window" ref="act_carrier_form"/>
</record>
<record model="ir.action.act_window.view"
id="act_carrier_form_view2">
<field name="sequence" eval="20"/>
- <field name="view" ref="carrier_view_form2"/>
+ <field name="view" ref="carrier_view_form"/>
<field name="act_window" ref="act_carrier_form"/>
</record>
<menuitem parent="menu_carrier" action="act_carrier_form"
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 204868a..0d10293 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -51,8 +51,9 @@ msgctxt "model:ir.action,name:act_carrier_form"
msgid "Carriers"
msgstr "Превозвачи"
+#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier Management"
+msgid "Carrier"
msgstr "Управление на превозвачи"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index c50d682..c88ee2b 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_method:"
msgid "Carrier Cost Method"
-msgstr "Mètode del cost de transportista"
+msgstr "Mètode cost del transportista"
msgctxt "field:carrier,carrier_product:"
msgid "Carrier Product"
@@ -51,7 +51,7 @@ msgid "Carriers"
msgstr "Transportistes"
msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier Management"
+msgid "Carrier"
msgstr "Transportistes"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 55b1cc5..b6b741e 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -51,7 +51,7 @@ msgid "Carriers"
msgstr ""
msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier Management"
+msgid "Carrier"
msgstr ""
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index b971b91..b550070 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -51,7 +51,7 @@ msgid "Carriers"
msgstr "Frachtführer"
msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier Management"
+msgid "Carrier"
msgstr "Frachtführer"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index c3050f0..5a38ff9 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -4,11 +4,11 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_method:"
msgid "Carrier Cost Method"
-msgstr "Método del costo de transportista"
+msgstr "Método costo de transportista"
msgctxt "field:carrier,carrier_product:"
msgid "Carrier Product"
-msgstr "Productos del transportista"
+msgstr "Producto del transportista"
msgctxt "field:carrier,create_date:"
msgid "Create Date"
@@ -51,8 +51,8 @@ msgid "Carriers"
msgstr "Transportistas"
msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier Management"
-msgstr "Manejo de Transporte"
+msgid "Carrier"
+msgstr "Transportistas"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
@@ -60,7 +60,7 @@ msgstr "Transportistas"
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
-msgstr "Administración de Transportista"
+msgstr "Administración de transportista"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index bf9fd9f..821b9e4 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -51,16 +51,16 @@ msgid "Carriers"
msgstr "Transportadores"
msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier Management"
-msgstr "Gestión de Empresa de Transporte"
+msgid "Carrier"
+msgstr "Transportadora"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
-msgstr "Empresa de Transporte"
+msgstr "Transportadoras"
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
-msgstr "Administración Empresa de Transportes"
+msgstr "Administración Transportadora"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
@@ -72,4 +72,4 @@ msgstr "Transportadora"
msgctxt "view:carrier:"
msgid "Carriers"
-msgstr "Transportadores"
+msgstr "Transportadoras"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 9503ae3..8b77644 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,11 +4,11 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_method:"
msgid "Carrier Cost Method"
-msgstr "Método del coste de transportista"
+msgstr "Método coste del transportista"
msgctxt "field:carrier,carrier_product:"
msgid "Carrier Product"
-msgstr "Productos del transportista"
+msgstr "Producto del transportista"
msgctxt "field:carrier,create_date:"
msgid "Create Date"
@@ -40,7 +40,7 @@ msgstr "Usuario modificación"
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
-msgstr "Método para procesar el coste del transportista."
+msgstr "Método para calcular el coste del transportista."
msgctxt "model:carrier,name:"
msgid "Carrier"
@@ -51,7 +51,7 @@ msgid "Carriers"
msgstr "Transportistas"
msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier Management"
+msgid "Carrier"
msgstr "Transportistas"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index f0bb63b..2401478 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -51,8 +51,8 @@ msgid "Carriers"
msgstr "Transporteurs"
msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier Management"
-msgstr "Gestion des transporteurs"
+msgid "Carrier"
+msgstr "Transporteurs"
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
msgid "Carriers"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 1045a29..ebaaaad 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -53,7 +53,7 @@ msgid "Carriers"
msgstr ""
msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier Management"
+msgid "Carrier"
msgstr ""
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 9dbc112..571c250 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -10,17 +10,20 @@ 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 "ID"
#, fuzzy
msgctxt "field:carrier,party:"
@@ -32,13 +35,15 @@ msgctxt "field:carrier,rec_name:"
msgid "Name"
msgstr "Наименование"
+#, fuzzy
msgctxt "field:carrier,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:carrier,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
@@ -53,7 +58,7 @@ msgid "Carriers"
msgstr ""
msgctxt "model:ir.ui.menu,name:menu_carrier"
-msgid "Carrier Management"
+msgid "Carrier"
msgstr ""
msgctxt "model:ir.ui.menu,name:menu_carrier_form"
diff --git a/setup.py b/setup.py
index 51ebd8a..4d6b3ec 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_carrier',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_carrier',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.carrier': '.'},
packages=[
'trytond.modules.carrier',
'trytond.modules.carrier.tests',
],
package_data={
- 'trytond.modules.carrier': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.carrier': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -56,6 +56,7 @@ setup(name='trytond_carrier',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/tryton.cfg b/tryton.cfg
index 1a74092..9b26c5a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
ir
party
diff --git a/trytond_carrier.egg-info/PKG-INFO b/trytond_carrier.egg-info/PKG-INFO
index 4b18a37..9dd7f51 100644
--- a/trytond_carrier.egg-info/PKG-INFO
+++ b/trytond_carrier.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-carrier
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module with carriers
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_carrier
=============
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_carrier.egg-info/SOURCES.txt b/trytond_carrier.egg-info/SOURCES.txt
index 3b5ceb7..3592c31 100644
--- a/trytond_carrier.egg-info/SOURCES.txt
+++ b/trytond_carrier.egg-info/SOURCES.txt
@@ -28,4 +28,6 @@ trytond_carrier.egg-info/dependency_links.txt
trytond_carrier.egg-info/entry_points.txt
trytond_carrier.egg-info/not-zip-safe
trytond_carrier.egg-info/requires.txt
-trytond_carrier.egg-info/top_level.txt
\ No newline at end of file
+trytond_carrier.egg-info/top_level.txt
+view/carrier_form.xml
+view/carrier_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 4c7a372..0dcc8a6 100644
--- a/trytond_carrier.egg-info/requires.txt
+++ b/trytond_carrier.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_party >= 2.6, < 2.7
-trytond_product >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_party >= 2.8, < 2.9
+trytond_product >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/carrier_form.xml b/view/carrier_form.xml
new file mode 100644
index 0000000..ce5fe64
--- /dev/null
+++ b/view/carrier_form.xml
@@ -0,0 +1,12 @@
+<?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">
+ <label name="party"/>
+ <field name="party"/>
+ <newline/>
+ <label name="carrier_product"/>
+ <field name="carrier_product"/>
+ <label name="carrier_cost_method"/>
+ <field name="carrier_cost_method"/>
+</form>
diff --git a/view/carrier_tree.xml b/view/carrier_tree.xml
new file mode 100644
index 0000000..d0c0cb9
--- /dev/null
+++ b/view/carrier_tree.xml
@@ -0,0 +1,8 @@
+<?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">
+ <field name="party"/>
+ <field name="carrier_product"/>
+ <field name="carrier_cost_method"/>
+</tree>
--
tryton-modules-carrier
More information about the tryton-debian-vcs
mailing list