Merge pull request AwesomeFoodCoops#1130 from trobz/S#25849

S#25849

extra_addons/pos_access_right/models/pos_config.py

@@ -47,29 +47,29 @@ class PosConfig(models.Model):
     @api.multi
     def _compute_group_pos_negative_qty(self):
         for config in self:
-            self.group_pos_negative_qty = \
+            config.group_pos_negative_qty = \
                 self.env.ref('pos_access_right.group_pos_negative_qty')
 
     @api.multi
     def _compute_group_pos_discount(self):
         for config in self:
-            self.group_pos_discount = \
+            config.group_pos_discount = \
                 self.env.ref('pos_access_right.group_pos_discount')
 
     @api.multi
     def _compute_group_pos_change_unit_price(self):
         for config in self:
-            self.group_pos_change_unit_price = \
+            config.group_pos_change_unit_price = \
                 self.env.ref('pos_access_right.group_pos_change_unit_price')
 
     @api.multi
     def _compute_group_pos_multi_order(self):
         for config in self:
-            self.group_pos_multi_order = \
+            config.group_pos_multi_order = \
                 self.env.ref('pos_access_right.group_pos_multi_order')
 
     @api.multi
     def _compute_group_pos_delete_order(self):
         for config in self:
-            self.group_pos_delete_order = \
+            config.group_pos_delete_order = \
                 self.env.ref('pos_access_right.group_pos_delete_order')

intercoop_addons/coop_membership/views/view_res_partner.xml

@@ -426,7 +426,7 @@
                                     colspan="2"/>
                             <field name="is_member"
                                    groups="coop_membership.group_membership_access_manager"/>
-                            <field name="badge_distribution_date" attrs="{'invisible': [('is_member', '=', False)]}"/>
+                            <field name="badge_distribution_date" attrs="{'invisible': [('is_member', '=', False), ('is_associated_people', '=', False)]}"/>
                             <field name="badge_to_distribute"/>
                             <field name="is_worker_member"
                                    groups="coop_membership.group_membership_access_manager"/>

intercoop_addons/coop_point_of_sale/static/src/xml/point_of_sale.xml

@@ -18,6 +18,8 @@
             <td>
                 <t t-if="partner.cooperative_state == 'not_concerned'">Non concerné</t>
                 <t t-if="partner.cooperative_state == 'unsubscribed'">Désinscrit</t>
+                <t t-if="partner.cooperative_state == 'exempted'">A jour</t>
+                <t t-if="partner.cooperative_state == 'vacation'">En congés</t>
                 <t t-if="partner.cooperative_state == 'up_to_date'">A jour</t>
                 <t t-if="partner.cooperative_state == 'alert'">En alerte</t>
                 <t t-if="partner.cooperative_state == 'suspended'">Suspendu</t>
@@ -41,6 +43,8 @@
                 <span class='detail cooperative-state'>
                     <t t-if="partner.cooperative_state == 'not_concerned'">Non concerné</t>
                     <t t-if="partner.cooperative_state == 'unsubscribed'">Désinscrit</t>
+                    <t t-if="partner.cooperative_state == 'exempted'">A jour</t>
+                    <t t-if="partner.cooperative_state == 'vacation'">En congés</t>
                     <t t-if="partner.cooperative_state == 'up_to_date'">A jour</t>
                     <t t-if="partner.cooperative_state == 'alert'">En alerte</t>
                     <t t-if="partner.cooperative_state == 'suspended'">Suspendu</t>

intercoop_addons/coop_print_badge/i18n/fr.po

@@ -43,7 +43,7 @@ msgstr "RATTACHÉ(E)"
 #. module: coop_print_badge
 #: model:ir.model,name:coop_print_badge.model_res_partner
 msgid "Badges To Print"
-msgstr "Badges à distribuer"
+msgstr "Badges à imprimer"
 
 #. module: coop_print_badge
 #: model:ir.ui.menu,name:coop_print_badge.menu_badge_to_print
@@ -71,4 +71,4 @@ msgstr "Badge à imprimer"
 #: model:ir.ui.menu,name:coop_print_badge.menu_badge_to_distribute
 #: model:ir.actions.act_window,name:coop_print_badge.action_badge_to_distribute
 msgid "Badges"
-msgstr "Badges à récupérer"
+msgstr "Badges à distribuer"

intercoop_addons/coop_print_badge/models/res_partner.py

@@ -74,7 +74,9 @@ def write(self, vals):
                         partner_vals.get(field_name) != partner[field_name]:
                     partner_vals['badge_to_print'] = True
                     break
-
+            if partner_vals.get('badge_to_print') and \
+                    not partner._check_badge_to_print(vals):
+                partner_vals['badge_to_print'] = False
             res = super(ResPartner, partner).write(partner_vals)
 
         return res
@@ -92,3 +94,28 @@ def _get_field_names_trigger_badge_reprint(self):
         field_ids = safe_eval(field_str)
         fields_recs = self.env['ir.model.fields'].sudo().browse(field_ids)
         return [field_item.name for field_item in fields_recs]
+
+    @api.multi
+    def _check_badge_to_print(self, vals={}):
+        self.ensure_one()
+        trigger_fields = self._get_field_names_trigger_badge_reprint()
+        fields_has_value = trigger_fields and \
+            all([field_item in vals and vals[field_item] or self[field_item]
+                for field_item in trigger_fields]) or False
+        #  S#25849: make sure the image is not the default one
+        img_field = 'image'
+        if img_field in trigger_fields and fields_has_value:
+            default_img = self._get_default_image(False)
+            if img_field in vals:
+                partner_img = vals[img_field]
+            else:
+                partner_img = self[img_field]
+            if not partner_img or default_img == partner_img:
+                return False
+        return fields_has_value
+
+    @api.model
+    def _get_default_image(self, is_company, colorize=False):
+        colorize = False
+        return super(ResPartner, self)._get_default_image(is_company, colorize)
+