[tryton-debian-vcs] tryton-modules-stock-split branch debian created. f9f2cb1974d5e617e91906fa6b910b7a16409c2e
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:11:36 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-stock-split.git;a=commitdiff;h=f9f2cb1974d5e617e91906fa6b910b7a16409c2e
commit f9f2cb1974d5e617e91906fa6b910b7a16409c2e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:39 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index a10c752..8af193b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-stock-split (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:55:37 +0100
+
tryton-modules-stock-split (2.8.0-2) unstable; urgency=low
* Moving doc/index.rst to appropriate subdirectory doc.
commit 932ae02ef49cd165173df1a5d7d35c6c5e5d4065
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:52 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index 5db5514..c0363ea 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-stock-split.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 08f829222941f312c4716ac3461b49608ff5ccef
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 9b06c63..5db5514 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-stock-split.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-stock-split.git
commit 096fcd761e1448e5fda54fdcb1e4750d829f8196
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:28:29 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 3ac4e21..a162b66 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 6f92569..9066628 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_split
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to split stock move
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_stock_split
===================
@@ -60,6 +60,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/fr_FR.po b/locale/fr_FR.po
index 4870616..d4d36c0 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -32,11 +32,11 @@ msgstr "Le nombre limit de mouvements"
msgctxt "model:ir.action,name:wizard_split_move"
msgid "Split Move"
-msgstr "Division du mouvement"
+msgstr "Diviser le mouvement"
msgctxt "model:stock.move.split.start,name:"
msgid "Split Move"
-msgstr "Division du mouvement"
+msgstr "Diviser le mouvement"
msgctxt "view:stock.move.split.start:"
msgid "Split Move"
@@ -44,7 +44,7 @@ msgstr "Diviser le mouvement"
msgctxt "view:stock.move:"
msgid "Split"
-msgstr "diviser"
+msgstr "Diviser"
msgctxt "wizard_button:stock.move.split,start,end:"
msgid "Cancel"
diff --git a/locale/fr_FR.po b/locale/sl_SI.po
similarity index 74%
copy from locale/fr_FR.po
copy to locale/sl_SI.po
index 4870616..7f9532b 100644
--- a/locale/fr_FR.po
+++ b/locale/sl_SI.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:stock.move.split.start,count:"
msgid "Counts"
-msgstr "Décompte"
+msgstr "Število"
msgctxt "field:stock.move.split.start,id:"
msgid "ID"
@@ -12,44 +12,44 @@ msgstr "ID"
msgctxt "field:stock.move.split.start,quantity:"
msgid "Quantity"
-msgstr "Quantité"
+msgstr "Količina"
msgctxt "field:stock.move.split.start,unit_digits:"
msgid "Unit Digits"
-msgstr "Décimales de l'unité"
+msgstr "Decimalke"
msgctxt "field:stock.move.split.start,uom:"
msgid "Uom"
-msgstr "Unité de mesure"
+msgstr "ME"
msgctxt "field:stock.move.split.start,uom_category:"
msgid "Uom Category"
-msgstr "Catégorie d'unité de mesure"
+msgstr "Kategorija ME"
msgctxt "help:stock.move.split.start,count:"
msgid "The limit number of moves"
-msgstr "Le nombre limit de mouvements"
+msgstr "Omejitev števila prenosov"
msgctxt "model:ir.action,name:wizard_split_move"
msgid "Split Move"
-msgstr "Division du mouvement"
+msgstr "Delitev prometa"
msgctxt "model:stock.move.split.start,name:"
msgid "Split Move"
-msgstr "Division du mouvement"
+msgstr "Delitev prometa"
msgctxt "view:stock.move.split.start:"
msgid "Split Move"
-msgstr "Diviser le mouvement"
+msgstr "Delitev prometa"
msgctxt "view:stock.move:"
msgid "Split"
-msgstr "diviser"
+msgstr "Delitev"
msgctxt "wizard_button:stock.move.split,start,end:"
msgid "Cancel"
-msgstr "Annuler"
+msgstr "Prekliči"
msgctxt "wizard_button:stock.move.split,start,split:"
msgid "Split"
-msgstr "Diviser"
+msgstr "Delitev"
diff --git a/setup.py b/setup.py
index 25b6175..d68d09c 100644
--- a/setup.py
+++ b/setup.py
@@ -66,6 +66,7 @@ setup(name='trytond_stock_split',
'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 2a975fa..47c1e5c 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_stock_split import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 0f74f32..fb9279e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
stock
diff --git a/trytond_stock_split.egg-info/PKG-INFO b/trytond_stock_split.egg-info/PKG-INFO
index f918780..7262d35 100644
--- a/trytond_stock_split.egg-info/PKG-INFO
+++ b/trytond_stock_split.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-split
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to split stock move
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_stock_split
===================
@@ -60,6 +60,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_stock_split.egg-info/SOURCES.txt b/trytond_stock_split.egg-info/SOURCES.txt
index bea2a9c..b8c8f97 100644
--- a/trytond_stock_split.egg-info/SOURCES.txt
+++ b/trytond_stock_split.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_stock_split.egg-info/PKG-INFO
trytond_stock_split.egg-info/SOURCES.txt
trytond_stock_split.egg-info/dependency_links.txt
diff --git a/trytond_stock_split.egg-info/requires.txt b/trytond_stock_split.egg-info/requires.txt
index bd880d2..bfa8717 100644
--- a/trytond_stock_split.egg-info/requires.txt
+++ b/trytond_stock_split.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_stock >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_stock >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit c46b3ba9ebe31a27568229e308a0e5c613449994
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 6 16:21:14 2013 +0200
Releasing debian version 2.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index e5cf2a4..a10c752 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-stock-split (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:33:43 +0200
+
tryton-modules-stock-split (2.8.0-1) experimental; urgency=low
* Merging upstream version 2.8.0.
commit c29ad241d9fad982008d7476e5917caa897d2764
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 b294c8cea2bb4fdaa4a49b2f5b890767ee8e404c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:19:30 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 c1b54c47e6469be0242f28d5ab32d25ac1d727a5
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-stock-split.docs b/debian/docs
similarity index 100%
rename from debian/tryton-modules-stock-split.docs
rename to debian/docs
commit 1c884fb5962b3d20128e493fc770c83a8f43cdbc
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-stock-split.docs b/debian/tryton-modules-stock-split.docs
index 172a1f8..a2e6bd4 100644
--- a/debian/tryton-modules-stock-split.docs
+++ b/debian/tryton-modules-stock-split.docs
@@ -1 +1 @@
-doc/index.rst
+doc/
commit 258f604618e7f65ce11711c4a7294b8ff62df706
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 17:27:13 2013 +0200
Releasing debian version 2.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 447f54b..e5cf2a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-stock-split (2.8.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.8.0.
+ * Updating copyright.
+ * First upload to Debian (Closes: #706852).
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 02 May 2013 15:21:07 +0200
+
tryton-modules-stock-split (2.6.0-2) experimental; urgency=low
* Improving update of major version in Depends.
commit 8b342eefece03d112746a4eba981a60b8486c014
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 14:13:11 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 900682e..629bf50 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2012 Cédric Krier
- 2012 B2CK SPRL
+Copyright: 2012-2013 Cédric Krier
+ 2012-2013 B2CK SPRL
License: GPL-3+
Files: debian/*
commit eac336d77410769ec6f04f71459b0d080e17ed4c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:38:12 2013 +0200
Merging upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 210505e..3ac4e21 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 747ae18..7668cfa 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012 Cédric Krier.
-Copyright (C) 2012 B2CK SPRL.
+Copyright (C) 2012-2013 Cédric Krier.
+Copyright (C) 2012-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 e4632a1..732a76e 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 e06cbda..6f92569 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_stock_split
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to split stock move
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_stock_split
===================
@@ -53,6 +53,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/locale/ca_ES.po b/locale/ca_ES.po
index 9b75020..b76c5e1 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,57 +4,52 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:stock.move.split.start,count:"
msgid "Counts"
-msgstr ""
+msgstr "Número"
-#, fuzzy
msgctxt "field:stock.move.split.start,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:stock.move.split.start,quantity:"
msgid "Quantity"
msgstr "Quantitat"
-#, fuzzy
msgctxt "field:stock.move.split.start,unit_digits:"
msgid "Unit Digits"
msgstr "Decimals unitaris"
-#, fuzzy
msgctxt "field:stock.move.split.start,uom:"
msgid "Uom"
msgstr "UdM"
msgctxt "field:stock.move.split.start,uom_category:"
msgid "Uom Category"
-msgstr ""
+msgstr "Categoria de la UdM"
msgctxt "help:stock.move.split.start,count:"
msgid "The limit number of moves"
-msgstr ""
+msgstr "El número màxim de moviments"
msgctxt "model:ir.action,name:wizard_split_move"
msgid "Split Move"
-msgstr ""
+msgstr "Divisió de moviments"
msgctxt "model:stock.move.split.start,name:"
msgid "Split Move"
-msgstr ""
+msgstr "Divisió de moviments"
msgctxt "view:stock.move.split.start:"
msgid "Split Move"
-msgstr ""
+msgstr "Divisió de moviments"
msgctxt "view:stock.move:"
msgid "Split"
-msgstr ""
+msgstr "Divideix"
-#, fuzzy
msgctxt "wizard_button:stock.move.split,start,end:"
msgid "Cancel"
msgstr "Cancel·la"
msgctxt "wizard_button:stock.move.split,start,split:"
msgid "Split"
-msgstr ""
+msgstr "Divideix"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index cba9b15..85d1acd 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -16,7 +16,7 @@ msgstr "Cantidad"
msgctxt "field:stock.move.split.start,unit_digits:"
msgid "Unit Digits"
-msgstr "Dígitos unitarios"
+msgstr "Dígitos de unidad"
msgctxt "field:stock.move.split.start,uom:"
msgid "Uom"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index d005488..4dae88c 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:stock.move.split.start,count:"
msgid "Counts"
-msgstr "Contador"
+msgstr "Contar"
msgctxt "field:stock.move.split.start,id:"
msgid "ID"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 2cbf194..68e2777 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -6,9 +6,10 @@ msgctxt "field:stock.move.split.start,count:"
msgid "Counts"
msgstr ""
+#, fuzzy
msgctxt "field:stock.move.split.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
#, fuzzy
msgctxt "field:stock.move.split.start,quantity:"
@@ -25,9 +26,10 @@ msgctxt "field:stock.move.split.start,uom:"
msgid "Uom"
msgstr "Ед.изм."
+#, fuzzy
msgctxt "field:stock.move.split.start,uom_category:"
msgid "Uom Category"
-msgstr ""
+msgstr "Категория ед. измерения"
msgctxt "help:stock.move.split.start,count:"
msgid "The limit number of moves"
diff --git a/setup.py b/setup.py
index 2f6069f..25b6175 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))
tests_require = ['proteus >= %s.%s, < %s.%s' %
(major_version, minor_version, major_version, minor_version + 1)]
@@ -38,16 +38,16 @@ setup(name='trytond_stock_split',
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.stock_split': '.'},
packages=[
'trytond.modules.stock_split',
'trytond.modules.stock_split.tests',
],
package_data={
- 'trytond.modules.stock_split': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.stock_split': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -59,6 +59,7 @@ setup(name='trytond_stock_split',
'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/stock.py b/stock.py
index 143895a..32fe863 100644
--- a/stock.py
+++ b/stock.py
@@ -48,7 +48,6 @@ class Move:
self.write([self], {
'quantity': quantity,
'uom': uom.id,
- 'state': state,
})
remainder -= quantity
if count:
@@ -58,7 +57,6 @@ class Move:
moves.extend(self.copy([self], {
'quantity': quantity,
'uom': uom.id,
- 'state': state,
}))
remainder -= quantity
if count:
@@ -68,8 +66,10 @@ class Move:
moves.extend(self.copy([self], {
'quantity': remainder,
'uom': uom.id,
- 'state': state,
}))
+ self.write(moves, {
+ 'state': state,
+ })
return moves
diff --git a/stock.xml b/stock.xml
index 4ec597d..53dc287 100644
--- a/stock.xml
+++ b/stock.xml
@@ -12,49 +12,19 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="move_view_form">
<field name="model">stock.move</field>
<field name="inherit" ref="stock.move_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/form/field[@name='state']"
- position="after">
- <button name="split_wizard" string="Split"
- colspan="2"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">move_form</field>
</record>
<record model="ir.ui.view" id="move_view_tree">
<field name="model">stock.move</field>
<field name="inherit" ref="stock.move_view_tree"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/tree"
- position="inside">
- <button name="split_wizard" string="Split"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">move_tree</field>
</record>
<record model="ir.ui.view" id="split_start_view_form">
<field name="model">stock.move.split.start</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Split Move" col="6">
- <label name="count"/>
- <field name="count"/>
- <label name="quantity"/>
- <field name="quantity"/>
- <label name="uom"/>
- <field name="uom"/>
- </form>
- ]]>
- </field>
+ <field name="name">split_start_form</field>
</record>
</data>
diff --git a/tests/__init__.py b/tests/__init__.py
index 96d4ef9..2a975fa 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#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 .test_stock_lot import suite
+from .test_stock_split import suite
diff --git a/tests/test_stock_split.py b/tests/test_stock_split.py
index e8311eb..6ae0750 100644
--- a/tests/test_stock_split.py
+++ b/tests/test_stock_split.py
@@ -26,6 +26,7 @@ class StockSplitTestCase(unittest.TestCase):
def setUp(self):
trytond.tests.test_tryton.install_module('stock_split')
self.uom = POOL.get('product.uom')
+ self.template = POOL.get('product.template')
self.product = POOL.get('product.product')
self.location = POOL.get('stock.location')
self.company = POOL.get('company.company')
@@ -50,31 +51,34 @@ class StockSplitTestCase(unittest.TestCase):
'''
with Transaction().start(DB_NAME, USER, context=CONTEXT):
unit, = self.uom.search([('name', '=', 'Unit')])
- product = self.product.create({
- 'name': 'Test Split',
- 'type': 'goods',
- 'cost_price_method': 'fixed',
- 'default_uom': unit.id,
- 'list_price': Decimal(0),
- 'cost_price': Decimal(0),
- })
+ template, = self.template.create([{
+ 'name': 'Test Split',
+ 'type': 'goods',
+ 'cost_price_method': 'fixed',
+ 'default_uom': unit.id,
+ 'list_price': Decimal(0),
+ 'cost_price': Decimal(0),
+ }])
+ product, = self.product.create([{
+ 'template': template.id,
+ }])
input_, = self.location.search([('code', '=', 'IN')])
storage, = self.location.search([('code', '=', 'STO')])
- company, = self.company.search([('name', '=', 'B2CK')])
+ company, = self.company.search([('rec_name', '=', 'B2CK')])
self.user.write([self.user(USER)], {
'main_company': company.id,
'company': company.id,
})
def create_move(quantity):
- move = self.move.create({
- 'product': product.id,
- 'uom': unit.id,
- 'quantity': quantity,
- 'from_location': input_.id,
- 'to_location': storage.id,
- 'company': company.id,
- })
+ move, = self.move.create([{
+ 'product': product.id,
+ 'uom': unit.id,
+ 'quantity': quantity,
+ 'from_location': input_.id,
+ 'to_location': storage.id,
+ 'company': company.id,
+ }])
return move
move = create_move(10)
diff --git a/tryton.cfg b/tryton.cfg
index 0817214..0f74f32 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
ir
stock
diff --git a/trytond_stock_split.egg-info/PKG-INFO b/trytond_stock_split.egg-info/PKG-INFO
index a7fb59b..f918780 100644
--- a/trytond_stock_split.egg-info/PKG-INFO
+++ b/trytond_stock_split.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-stock-split
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to split stock move
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_stock_split
===================
@@ -53,6 +53,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_stock_split.egg-info/SOURCES.txt b/trytond_stock_split.egg-info/SOURCES.txt
index d8e3e20..bea2a9c 100644
--- a/trytond_stock_split.egg-info/SOURCES.txt
+++ b/trytond_stock_split.egg-info/SOURCES.txt
@@ -28,4 +28,7 @@ trytond_stock_split.egg-info/dependency_links.txt
trytond_stock_split.egg-info/entry_points.txt
trytond_stock_split.egg-info/not-zip-safe
trytond_stock_split.egg-info/requires.txt
-trytond_stock_split.egg-info/top_level.txt
\ No newline at end of file
+trytond_stock_split.egg-info/top_level.txt
+view/move_form.xml
+view/move_tree.xml
+view/split_start_form.xml
\ No newline at end of file
diff --git a/trytond_stock_split.egg-info/requires.txt b/trytond_stock_split.egg-info/requires.txt
index c2750a1..bd880d2 100644
--- a/trytond_stock_split.egg-info/requires.txt
+++ b/trytond_stock_split.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_stock >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_stock >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/move_form.xml b/view/move_form.xml
new file mode 100644
index 0000000..8057eb0
--- /dev/null
+++ b/view/move_form.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. -->
+<data>
+ <xpath expr="/form/field[@name='state']" position="after">
+ <button name="split_wizard" string="Split" colspan="2"/>
+ </xpath>
+</data>
diff --git a/view/move_tree.xml b/view/move_tree.xml
new file mode 100644
index 0000000..e7d5b40
--- /dev/null
+++ b/view/move_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. -->
+<data>
+ <xpath expr="/tree" position="inside">
+ <button name="split_wizard" string="Split"/>
+ </xpath>
+</data>
diff --git a/view/split_start_form.xml b/view/split_start_form.xml
new file mode 100644
index 0000000..3f5f83a
--- /dev/null
+++ b/view/split_start_form.xml
@@ -0,0 +1,11 @@
+<?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="Split Move" col="6">
+ <label name="count"/>
+ <field name="count"/>
+ <label name="quantity"/>
+ <field name="quantity"/>
+ <label name="uom"/>
+ <field name="uom"/>
+</form>
commit d2e2a1e9bdaab9de630ea3bf2d5e96f035bfd6e0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 18:44:57 2013 +0200
Releasing debian version 2.6.0-2.
diff --git a/debian/changelog b/debian/changelog
index 661be47..447f54b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-stock-split (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:09:19 +0200
+
tryton-modules-stock-split (2.6.0-1) experimental; urgency=low
* Initial packaging.
commit 78c8bb4cf9956ab986bb367d9b50841cc026ec6e
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 20756f3..9b06c63 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-stock-split
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-stock (>= 2.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-stock (>= ${version:major}), python-pkg-resources
Description: Tryton Application Platform (Stock Move Split 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 3995a8b8b1084f48ed622f52c920c08a8654cccb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 23 15:09:34 2013 +0200
Adding debian version 2.6.0-1.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..661be47
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-modules-stock-split (2.6.0-1) experimental; urgency=low
+
+ * Initial packaging.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 23 Apr 2013 14:36:52 +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..20756f3
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,23 @@
+Source: tryton-modules-stock-split
+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-stock-split.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-modules-stock-split.git
+X-Python-Version: >= 2.6
+
+Package: tryton-modules-stock-split
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
+ tryton-modules-stock (>= 2.6), python-pkg-resources
+Description: Tryton Application Platform (Stock Move Split 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 a wizzard on the stock move, that allows one to split it.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..900682e
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,28 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files: *
+Copyright: 2012 Cédric Krier
+ 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-stock-split.docs b/debian/tryton-modules-stock-split.docs
new file mode 100644
index 0000000..172a1f8
--- /dev/null
+++ b/debian/tryton-modules-stock-split.docs
@@ -0,0 +1 @@
+doc/index.rst
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..ad998af
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*trytond_stock_split-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
tryton-modules-stock-split
More information about the tryton-debian-vcs
mailing list