[tryton-debian-vcs] tryton-modules-health-stock branch debian updated. debian/2.8.1-1-15-g1f18c47
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Aug 10 19:16:36 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-health-stock.git;a=commitdiff;h=debian/2.8.1-1-15-g1f18c47
commit 1f18c47974b9a1f2b955539ea3422117e2d512f8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Aug 10 18:49:46 2016 +0200
Releasing debian version 3.0.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 1b9407c..f2ff46e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-health-stock (3.0.2-1) unstable; urgency=medium
+
+ * Updating to Standards-Version: 3.9.8, no changes needed.
+ * Merging upstream version 3.0.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 10 Aug 2016 18:49:46 +0200
+
tryton-modules-health-stock (3.0.1-1) unstable; urgency=medium
* Wrapping and sorting control files (wrap-and-sort -bts).
commit 2476b4e567605c20708c30cf486462b5ee78a3b4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Aug 10 18:49:45 2016 +0200
Merging upstream version 3.0.2.
diff --git a/PKG-INFO b/PKG-INFO
index 48fee8a..4f2d4fd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_health_stock
-Version: 3.0.1
+Version: 3.0.2
Summary: GNU Health Stock Module
Home-page: http://health.gnu.org/
Author: GNU Solidario
diff --git a/health_stock.py b/health_stock.py
index 3f19d3e..312b508 100644
--- a/health_stock.py
+++ b/health_stock.py
@@ -72,7 +72,7 @@ class Medicament:
class Party:
__name__ = 'party.party'
warehouse = fields.Many2One('stock.location', 'Warehouse',
- domain=[('type', '=', 'warehouse')],
+ domain=[('type', 'in', ['warehouse', 'storage'])],
states={
'invisible': Not(Bool(Eval('is_pharmacy'))),
'required': Bool(Eval('is_pharmacy')),
diff --git a/tryton.cfg b/tryton.cfg
index e57db8a..3f9f97e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.1
+version=3.0.2
depends:
health_nursing
stock_lot
diff --git a/trytond_health_stock.egg-info/PKG-INFO b/trytond_health_stock.egg-info/PKG-INFO
index d69eb53..b2c3d1a 100644
--- a/trytond_health_stock.egg-info/PKG-INFO
+++ b/trytond_health_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-health-stock
-Version: 3.0.1
+Version: 3.0.2
Summary: GNU Health Stock Module
Home-page: http://health.gnu.org/
Author: GNU Solidario
diff --git a/trytond_health_stock.egg-info/requires.txt b/trytond_health_stock.egg-info/requires.txt
index e5accc8..9de01a2 100644
--- a/trytond_health_stock.egg-info/requires.txt
+++ b/trytond_health_stock.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_health_nursing == 3.0.1
+trytond_health_nursing == 3.0.2
trytond_stock_lot >= 3.8, < 3.9
trytond >= 3.8, < 3.9
diff --git a/wizard/wizard_create_prescription_stock_move.py b/wizard/wizard_create_prescription_stock_move.py
index 0a0313d..59ba6fe 100644
--- a/wizard/wizard_create_prescription_stock_move.py
+++ b/wizard/wizard_create_prescription_stock_move.py
@@ -62,13 +62,16 @@ class CreatePrescriptionStockMove(Wizard):
if not prescription.pharmacy:
self.raise_user_error('no_pharmacy_selected')
+ from_location = prescription.pharmacy.warehouse
+ if from_location.type == 'warehouse':
+ from_location = from_location.storage_location
+ to_location = prescription.patient.name.customer_location
+
for line in prescription.prescription_line:
move = StockMove()
move.origin = prescription
- move.from_location = (
- prescription.pharmacy.warehouse.storage_location)
- move.to_location = (
- prescription.patient.name.customer_location)
+ move.from_location = from_location
+ move.to_location = to_location
move.product = line.medicament.name
move.unit_price = line.medicament.name.list_price
move.quantity = line.quantity
--
tryton-modules-health-stock
More information about the tryton-debian-vcs
mailing list