[tryton-debian-vcs] tryton-modules-health-inpatient branch debian updated. debian/3.0.5-1-2-g536137a

[Mathias Behrle]

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-inpatient.git;a=commitdiff;h=debian/3.0.5-1-2-g536137a

commit 536137a4155a0dc9bc9799eae016e779c6296151
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 14 09:36:38 2017 +0100

    Releasing debian version 3.0.6-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 639bd79..bda9686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-health-inpatient (3.0.6-1) unstable; urgency=medium
+
+  * Merging upstream version 3.0.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 14 Feb 2017 09:36:38 +0100
+
 tryton-modules-health-inpatient (3.0.5-1) unstable; urgency=medium
 
   * Merging upstream version 3.0.5.
commit 80709e7fdc44e70a926423183d0ad2589687bf4b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 14 09:36:38 2017 +0100

    Merging upstream version 3.0.6.

diff --git a/PKG-INFO b/PKG-INFO
index 0e56c93..2a73df7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_health_inpatient
-Version: 3.0.5
+Version: 3.0.6
 Summary: GNU Health Hospitalization Module
 Home-page: http://health.gnu.org/
 Author: GNU Solidario
diff --git a/health_inpatient.py b/health_inpatient.py
index 32ab293..f09dbbb 100644
--- a/health_inpatient.py
+++ b/health_inpatient.py
@@ -751,7 +751,7 @@ class InpatientMealOrder (ModelSQL, ModelView):
 
     remarks = fields.Text('Remarks')
 
-    meal_warning = fields.Boolean('Warning',readonly=True,
+    meal_warning = fields.Boolean('Warning',
         help="The patient has special needs on meals")
 
     meal_warning_ack = fields.Boolean('Ack',
@@ -804,7 +804,7 @@ class InpatientMealOrder (ModelSQL, ModelView):
             meal_order.check_health_professional()
             
     def check_meal_order_warning(self):
-        if not self.meal_warning_ack:
+        if not self.meal_warning_ack and self.meal_warning:
             self.raise_user_error('meal_order_warning')
 
     def check_health_professional(self):
@@ -814,19 +814,14 @@ class InpatientMealOrder (ModelSQL, ModelView):
 
     @fields.depends('name')
     def on_change_name(self):
-        meal_warning = False
-        meal_warning_ack = True
         if self.name:
             # Trigger the warning if the patient 
             # has special needs on meals (religion / philosophy )
             if (self.name.patient.vegetarian_type or 
                 self.name.patient.diet_belief):
-                meal_warning = True
-                meal_warning_ack = False
-        return {
-            'meal_warning': meal_warning,
-            'meal_warning_ack': meal_warning_ack,
-        }
+                self.meal_warning = True
+                self.meal_warning_ack = False
+
 
     @classmethod
     def __setup__(cls):
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/tryton.cfg b/tryton.cfg
index 79b0970..2061d12 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.5
+version=3.0.6
 depends:
     health
     health_lifestyle
diff --git a/trytond_health_inpatient.egg-info/PKG-INFO b/trytond_health_inpatient.egg-info/PKG-INFO
index 3bd74b0..15543db 100644
--- a/trytond_health_inpatient.egg-info/PKG-INFO
+++ b/trytond_health_inpatient.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-health-inpatient
-Version: 3.0.5
+Version: 3.0.6
 Summary: GNU Health Hospitalization Module
 Home-page: http://health.gnu.org/
 Author: GNU Solidario
diff --git a/trytond_health_inpatient.egg-info/requires.txt b/trytond_health_inpatient.egg-info/requires.txt
index 187888b..2fa1443 100644
--- a/trytond_health_inpatient.egg-info/requires.txt
+++ b/trytond_health_inpatient.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_health == 3.0.5
-trytond_health_lifestyle == 3.0.5
+trytond_health == 3.0.6
+trytond_health_lifestyle == 3.0.6
 trytond >= 3.8, < 3.9
diff --git a/view/gnuhealth_inpatient_meal_order_tree.xml b/view/gnuhealth_inpatient_meal_order_tree.xml
index f443c01..dba6b0d 100644
--- a/view/gnuhealth_inpatient_meal_order_tree.xml
+++ b/view/gnuhealth_inpatient_meal_order_tree.xml
@@ -2,8 +2,7 @@
 <tree string="Inpatient Meal Order">
     <field name="name" expand="1"/>
     <field name="meal_order" expand="1"/>
-    <field name="mealtime" widget="date"/>
-    <field name="mealtime" widget="time"/>
+    <field name="mealtime"/>
     <field name="meal_item" expand="1"/>
     <button name="done" help="The meal order is done" string="Done" confirm="The meal order will be closed"/>
     <field name="state" expand="1"/>
-- 
tryton-modules-health-inpatient