[tryton-debian-vcs] tryton-modules-carrier branch debian created. cf701cecc4a5d13ff9f3d16d6e104153f6cad12a
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 debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-carrier.git;a=commitdiff;h=cf701cecc4a5d13ff9f3d16d6e104153f6cad12a
commit cf701cecc4a5d13ff9f3d16d6e104153f6cad12a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:10 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 2f30772..5f39727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-carrier (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:53:48 +0100
+
tryton-modules-carrier (2.8.0-2) unstable; urgency=low
* Moving doc/index.rst to appropriate subdirectory doc.
commit d46aaf39f45c7b25f636500eb1b10be64cd8cef7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index 24f6740..17b1ab2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-carrier.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit a4f969acdf621afaf32703af7a4fdcefb61dfcdc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index 0cd5c90..24f6740 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-carrier.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-carrier.git
commit 04d3232ec63ff2c4b9c12c6b6be23eb75f49fe41
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:51 2013 +0100
Merging 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 f442b0102d1ffab3c8b3dfc0a50699a8df554973
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 6 16:20:48 2013 +0200
Releasing debian version 2.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index 6d30290..2f30772 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-carrier (2.8.0-2) unstable; urgency=low
+
+ * Moving doc/index.rst to appropriate subdirectory doc.
+ * Simplifying package layout by renaming <pkg_name>.docs to docs.
+ * Removing needless empty line in rules.
+ * Adapting the rules file to work also with git-buildpackage.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 06 Aug 2013 13:32:38 +0200
+
tryton-modules-carrier (2.8.0-1) experimental; urgency=low
* Merging upstream version 2.8.0.
commit 9184254912a759a098378776b50be255060de99d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Aug 5 18:06:36 2013 +0200
Adapting the rules file to work also with git-buildpackage.
diff --git a/debian/rules b/debian/rules
index a6a1fb8..30074ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,24 @@
#!/usr/bin/make -f
MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := $(shell python setup.py --name)
%:
dh ${@} --with python2
override_dh_auto_clean:
dh_auto_clean
+
+override_dh_auto_build:
+ mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
+ mv PKG-INFO PKG-INFO.hen
+ dh_auto_build
+
+override_dh_auto_install:
+ dh_auto_install
rm -rf *.egg-info
+ mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
+ mv PKG-INFO.hen PKG-INFO
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 51fad1732b54254b64d6e2ab986fc8e1885001cf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:19:29 2013 +0200
Removing needless empty line in rules.
diff --git a/debian/rules b/debian/rules
index 0f63ab4..a6a1fb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@ MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
override_dh_auto_clean:
dh_auto_clean
-
rm -rf *.egg-info
override_dh_gencontrol:
commit ceaa0f42250a0921f6a4d1b4e914a2bbc5f2b2b0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 16:57:52 2013 +0200
Simplifying package layout by renaming <pkg_name>.docs to docs.
Thanks to Andreas Tille for this proposal. Since tryton module packages
will most probably stay simple binary packages this change simplifies the
package layout.
diff --git a/debian/tryton-modules-carrier.docs b/debian/docs
similarity index 100%
rename from debian/tryton-modules-carrier.docs
rename to debian/docs
commit ee1888565ab6e2ae1a55635ff9c490797861ab37
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 14 18:40:52 2013 +0200
Moving doc/index.rst to appropriate subdirectory doc.
diff --git a/debian/tryton-modules-carrier.docs b/debian/tryton-modules-carrier.docs
index 172a1f8..a2e6bd4 100644
--- a/debian/tryton-modules-carrier.docs
+++ b/debian/tryton-modules-carrier.docs
@@ -1 +1 @@
-doc/index.rst
+doc/
commit e567b43764ebc138128d937149e838c448b4faf8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 17:27:04 2013 +0200
Releasing debian version 2.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 9ee0dee..6d30290 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-carrier (2.8.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.8.0.
+ * Updating copyright.
+ * First upload to Debian (Closes: #706839).
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 02 May 2013 15:19:56 +0200
+
tryton-modules-carrier (2.6.0-2) experimental; urgency=low
* Improving update of major version in Depends.
commit 3a3f7cf83f8917bea654390539cf69425aedc8ef
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 14:13:10 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 776b559..a848836 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2011-2012 Cédric Krier
- 2011-2012 Bertrand Chenal
+Copyright: 2011-2013 Cédric Krier
+ 2011-2013 Bertrand Chenal
2011 Nicolas Évrard
- 2011-2012 B2CK SPRL
+ 2011-2013 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 63fb739ede5e9f33984f145ca41f1bedfca55fce
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:35:44 2013 +0200
Merging 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>
commit 237529200d2f7b4c748df1037e584f74bb4531f2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 18:44:43 2013 +0200
Releasing debian version 2.6.0-2.
diff --git a/debian/changelog b/debian/changelog
index 63d957b..9ee0dee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-carrier (2.6.0-2) experimental; urgency=low
+
+ * Improving update of major version in Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 27 Apr 2013 15:06:31 +0200
+
tryton-modules-carrier (2.6.0-1) experimental; urgency=low
* Initial packaging.
commit 4c058e7d08cddd317acc91314194bf4a17db6993
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 14:54:48 2013 +0200
Improving update of major version in Depends.
Pulling the major version for Depends directly from the package version.
Thanks to Ilya Melnikov for pushing the idea.
diff --git a/debian/control b/debian/control
index 5c8bc92..0cd5c90 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ X-Python-Version: >= 2.6
Package: tryton-modules-carrier
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-party (>= 2.6), tryton-modules-product (>= 2.6),
- python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-party (>= ${version:major}),
+ tryton-modules-product (>= ${version:major}), python-pkg-resources
Description: Tryton Application Platform (Carrier Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
%:
dh ${@} --with python2
@@ -8,5 +10,8 @@ override_dh_auto_clean:
rm -rf *.egg-info
+override_dh_gencontrol:
+ dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
override_dh_builddeb:
dh_builddeb -- -Zxz -z9
commit c6b555060d249c88502a65547ec000466218959e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 23 15:08:28 2013 +0200
Adding debian version 2.6.0-1.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..63d957b
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-modules-carrier (2.6.0-1) experimental; urgency=low
+
+ * Initial packaging.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 23 Apr 2013 14:32:02 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..5c8bc92
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,24 @@
+Source: tryton-modules-carrier
+Section: python
+Priority: optional
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
+Uploaders: Mathias Behrle <mathiasb at m9s.biz>
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Standards-Version: 3.9.4
+Homepage: http://www.tryton.org/
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-carrier.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-modules-carrier.git
+X-Python-Version: >= 2.6
+
+Package: tryton-modules-carrier
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
+ tryton-modules-party (>= 2.6), tryton-modules-product (>= 2.6),
+ python-pkg-resources
+Description: Tryton Application Platform (Carrier Module)
+ Tryton is a high-level general purpose application platform written in Python
+ and using PostgreSQL as database engine. It is the core base of a complete
+ business solution.
+ .
+ This package adds the handling of carrier costs.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..776b559
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,30 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files: *
+Copyright: 2011-2012 Cédric Krier
+ 2011-2012 Bertrand Chenal
+ 2011 Nicolas Évrard
+ 2011-2012 B2CK SPRL
+License: GPL-3+
+
+Files: debian/*
+Copyright: 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012-2013 Mathias Behrle <mathiasb at m9s.biz>
+License: GPL-3+
+
+License: GPL-3+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ The complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..1ae0776
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+
+%:
+ dh ${@} --with python2
+
+override_dh_auto_clean:
+ dh_auto_clean
+
+ rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..22a4de9
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = xz
+compression-level = 9
diff --git a/debian/tryton-modules-carrier.docs b/debian/tryton-modules-carrier.docs
new file mode 100644
index 0000000..172a1f8
--- /dev/null
+++ b/debian/tryton-modules-carrier.docs
@@ -0,0 +1 @@
+doc/index.rst
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..31be712
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*trytond_carrier-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
tryton-modules-carrier
More information about the tryton-debian-vcs
mailing list