[tryton-debian-vcs] tryton-modules-stock-supply branch debian-wheezy-2.2 created. 6bcab958f39b52e9335c6ebd8708553c67f3b65d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:12:07 UTC 2013
The following commit has been merged in the debian-wheezy-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply.git;a=commitdiff;h=6bcab958f39b52e9335c6ebd8708553c67f3b65d
commit 6bcab958f39b52e9335c6ebd8708553c67f3b65d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Jun 11 14:42:58 2013 +0200
Releasing debian version 2.2.3-1.
diff --git a/debian/changelog b/debian/changelog
index 86c2a46..35166e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-stock-supply (2.2.3-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.3.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 11 Jun 2013 14:07:09 +0200
+
tryton-modules-stock-supply (2.2.2-1) unstable; urgency=low
* Merging upstream version 2.2.2.
commit 1562942694252bf71e4b7f4bedc74067b8cf080c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Jun 11 14:05:25 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 3fd27d0..4406ae8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2008-2012 Cedric Krier
+Copyright: 2008-2013 Cédric Krier
2008-2011 Bertrand Chenal
- 2008-2012 B2CK SPRL
+ 2008-2013 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 452f80262890bc92a1c6f7573967827e3dd1c87c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Jun 11 14:03:27 2013 +0200
Merging upstream version 2.2.3.
diff --git a/CHANGELOG b/CHANGELOG
index bfbc3f5..fa2c165 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.3 - 2013-06-09
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.2 - 2012-09-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 26f578f..da9ef80 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-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/PKG-INFO b/PKG-INFO
index 032ad64..67497ac 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_stock_supply
-Version: 2.2.2
+Version: 2.2.3
Summary: Supply Management Module with:
- Order point
- Purchase Request
diff --git a/__tryton__.py b/__tryton__.py
index a0814dd..f09c2fc 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Gestión de pedidos de inventario',
'name_es_ES': 'Gestión de suministro de existencias',
'name_fr_FR': 'Gestion des approvisionnements de stock',
- 'version': '2.2.2',
+ 'version': '2.2.3',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/shipment.py b/shipment.py
index 89a73ee..0ec99d3 100644
--- a/shipment.py
+++ b/shipment.py
@@ -54,8 +54,8 @@ class ShipmentInternal(ModelSQL, ModelView):
for op in order_points:
qty = pbl.get((op.storage_location.id, op.product.id), 0)
if qty < op.min_quantity:
- key = (op.storage_location.id,
- op.provisioning_location.id,
+ key = (op.provisioning_location.id,
+ op.storage_location.id,
op.product.id)
moves[key] = op.max_quantity - qty
@@ -68,8 +68,8 @@ class ShipmentInternal(ModelSQL, ModelView):
])
for shipment in self.browse(shipment_ids):
for move in shipment.moves:
- key = (shipment.to_location.id,
- shipment.from_location.id,
+ key = (shipment.from_location.id,
+ shipment.to_location.id,
move.product.id)
if key not in moves:
continue
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index 181f0f8..9b7d898 100644
--- a/trytond_stock_supply.egg-info/PKG-INFO
+++ b/trytond_stock_supply.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-stock-supply
-Version: 2.2.2
+Version: 2.2.3
Summary: Supply Management Module with:
- Order point
- Purchase Request
commit f5e33e774f196702def5bef70d84a73b150a10e1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 3 23:00:00 2012 +0200
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index a508512..86c2a46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-stock-supply (2.2.2-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 03 Oct 2012 21:51:41 +0200
+
tryton-modules-stock-supply (2.2.1-2) unstable; urgency=low
* Updating maintainers field.
commit d56e314ed08ba8a15a0abd717845b6d9f64b60b4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Sep 12 15:45:20 2012 +0200
Merging upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index 6660507..bfbc3f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.1 - 2012-05-07
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 7324b2d..032ad64 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: trytond_stock_supply
-Version: 2.2.1
+Version: 2.2.2
Summary: Supply Management Module with:
- Order point
- Purchase Request
diff --git a/__tryton__.py b/__tryton__.py
index 6f35cd9..a0814dd 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Gestión de pedidos de inventario',
'name_es_ES': 'Gestión de suministro de existencias',
'name_fr_FR': 'Gestion des approvisionnements de stock',
- 'version': '2.2.1',
+ 'version': '2.2.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/purchase_request.py b/purchase_request.py
index 717f758..8ac90f0 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -697,10 +697,10 @@ class CreatePurchase(Wizard):
for tax in request.product.supplier_taxes_used:
if request.party and request.party.supplier_tax_rule:
pattern = self._get_tax_rule_pattern(request)
- tax_id = tax_rule_obj.apply(request.party.supplier_tax_rule,
+ tax_ids = tax_rule_obj.apply(request.party.supplier_tax_rule,
tax, pattern)
- if tax_id:
- taxes.append(tax_id)
+ if tax_ids:
+ taxes.extend(tax_ids)
continue
taxes.append(tax.id)
line['taxes'] = [('add', taxes)]
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index cd1199f..181f0f8 100644
--- a/trytond_stock_supply.egg-info/PKG-INFO
+++ b/trytond_stock_supply.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: trytond-stock-supply
-Version: 2.2.1
+Version: 2.2.2
Summary: Supply Management Module with:
- Order point
- Purchase Request
commit cd1d0c35aa87d47f56556a564cb1dbb0a7f81507
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:34:13 2012 +0200
Releasing debian version 2.2.1-2.
diff --git a/debian/changelog b/debian/changelog
index 552015c..a508512 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-stock-supply (2.2.1-2) unstable; urgency=low
+
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 30 Jun 2012 18:33:57 +0200
+
tryton-modules-stock-supply (2.2.1-1) unstable; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 1b0bddf35c9c6c7a60573ff4e848e44d93a24775
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:29 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 009c393..e433a69 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-stock-supply.git
commit e7acdf5002953b1fbdb7ede0fecbaa74eb04bbdb
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:37 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit 300c5e85b2d32b704c35ec703383a68be530b2cc
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:25 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 6b2a315..3fd27d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,15 +2,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2008-2012 Cedric Krier
- (C) 2008-2011 Bertrand Chenal
- (C) 2008-2012 B2CK SPRL
+ 2008-2012 Cedric Krier
+ 2008-2011 Bertrand Chenal
+ 2008-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 6e77bcb4e21840b1802ad4a8d64c18fcdca75b6b
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:04 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index c79dcdb..009c393 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-stock-supply.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-stock-supply.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-stock-supply.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-stock-supply.git
X-Python-Version: >= 2.5
Package: tryton-modules-stock-supply
commit bc5999432b26ea3ed0030af82348f4878c3b3cfd
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:31 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index b8561d4..c79dcdb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-stock-supply
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
commit 44c06e96f665ab96b5aa65dac4b9effed8cd77e2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 13:12:39 2012 +0200
Releasing debian version 2.2.1-1.
diff --git a/debian/changelog b/debian/changelog
index a02b432..552015c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-stock-supply (2.2.1-1) unstable; urgency=low
+
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding myself to copyright.
+ * Adding Format header for DEP5.
+ * Merging upstream version 2.2.1.
+ * Updating years in copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 09 May 2012 12:02:01 +0200
+
tryton-modules-stock-supply (2.2.0-1) unstable; urgency=low
* Updating versioned tryton depends to 2.2.
commit beb254663db82710b50e968215efd3ba18f0c53c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 12:01:54 2012 +0200
Updating years in copyright.
diff --git a/debian/copyright b/debian/copyright
index d2ad74d..6b2a315 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2008-2011 Cedric Krier
+ (C) 2008-2012 Cedric Krier
(C) 2008-2011 Bertrand Chenal
- (C) 2008-2011 B2CK SPRL
+ (C) 2008-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 051508402ed9858b38f72cd95817446be446c1f4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 12:01:18 2012 +0200
Merging upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 4816d83..6660507 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2012-05-07
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-25
* Bug fixes (see mercurial logs for details)
* Add wizard to create purchase requests
diff --git a/COPYRIGHT b/COPYRIGHT
index 3d2324b..26f578f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2012 Cédric Krier.
Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 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/PKG-INFO b/PKG-INFO
index 2112119..7324b2d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_stock_supply
-Version: 2.2.0
+Version: 2.2.1
Summary: Supply Management Module with:
- Order point
- Purchase Request
diff --git a/__tryton__.py b/__tryton__.py
index be9715a..6f35cd9 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Gestión de pedidos de inventario',
'name_es_ES': 'Gestión de suministro de existencias',
'name_fr_FR': 'Gestion des approvisionnements de stock',
- 'version': '2.2.0',
+ 'version': '2.2.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/purchase_request.py b/purchase_request.py
index b141387..717f758 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -2,6 +2,7 @@
#this repository contains the full copyright notices and license terms.
import datetime
import operator
+from decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard
from trytond.pyson import If, In, Eval, Get
@@ -668,6 +669,7 @@ class CreatePurchase(Wizard):
party_obj = pool.get('party.party')
product_obj = pool.get('product.product')
tax_rule_obj = pool.get('account.tax.rule')
+ line_obj = pool.get('purchase.line')
line = {
'product': request.product.id,
@@ -683,6 +685,8 @@ class CreatePurchase(Wizard):
currency=request.company.currency.id):
product_price = product_obj.get_purchase_price(
[request.product.id], request.quantity)[request.product.id]
+ product_price = product_price.quantize(
+ Decimal(1) / 10 ** line_obj.unit_price.digits[1])
if not product_price:
self.raise_user_error('missing_price', (request.product.name,
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index b7f072a..cd1199f 100644
--- a/trytond_stock_supply.egg-info/PKG-INFO
+++ b/trytond_stock_supply.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-stock-supply
-Version: 2.2.0
+Version: 2.2.1
Summary: Supply Management Module with:
- Order point
- Purchase Request
--
tryton-modules-stock-supply
More information about the tryton-debian-vcs
mailing list