FJG: merge awesomefoodcoops/9.0 cd42c279612a7d1b94be9a932d5a1676404e18d6

(missing dependcies bis)
supercoopbdx · Jan 28, 2021 · ff21894 · ff21894
1 parent 313281f
commit ff21894
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 36 deletions.
diff --git a/coop_print_badge/models/members_config_settings.py b/coop_print_badge/models/members_config_settings.py
@@ -8,8 +8,8 @@
 from openerp.tools.safe_eval import safe_eval
 
 
-class MemberConfigSettings(models.TransientModel):
-    _inherit = 'members.config.settings'
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'coop_shift.config.settings'
 
     reprint_change_field_ids = fields.Many2many(
         'ir.model.fields', string="Fields trigger badge reprinting",

diff --git a/coop_print_badge/report/report_printbadge.xml b/coop_print_badge/report/report_printbadge.xml
@@ -18,7 +18,7 @@
                     <div class="coop_text">
 	                      <t t-if="partner.sex=='m'">Coopérateur</t>
 	                      <t t-if="partner.sex=='f'">Coopératrice</t>
-	                      <t t-if="partner.sex=='o'">Coopérateur/trice</t>
+	                      <t t-if="partner.sex=='o'">Coop</t>
                     </div>
                     <div class="member_name">
                         <t t-if="partner.name.find(',')&gt;0"><span t-esc="partner.name.split(',')[1]" class="break_2_lines"/></t><br/>
@@ -38,14 +38,8 @@
                     <div class="member_photo_div">
                         <img t-attf-src="data:image/png;base64,{{images[partner.id]}}" class="member_photo"/>
                     </div>
-                    <div class="coop_text_small">
-                        <span>Rattaché à</span>
-                    </div>
-                    <div class="member_number_asociate">
-                        <!--N°--> <span t-field="partner.parent_id.barcode_base"/>
-                    </div>
 
-                    <div class="coop_text">
+                    <div class="coop_text_asociate">
                         <t t-if="partner.sex=='m'">Rattaché n°</t>
                       	<t t-if="partner.sex=='f'">Rattachée n°</t>
                       	<t t-if="partner.sex=='o'">Rattaché(e) n°</t>

diff --git a/coop_print_badge/static/src/css/badge.css b/coop_print_badge/static/src/css/badge.css
@@ -26,43 +26,42 @@
     height: 100%
 }
 
-.coop_text_small {
-    margin-left: 48mm;
-    margin-top: 1mm;
-    color: #425570;
-    font-family: "Intro Pro";
-    font-size: 0.7em;
-    text-transform: uppercase;
-}
-
-
 .member_number {
-    margin-left: 52mm;
-    margin-top: 4mm;
+    margin-left: 45mm;
+    margin-top: 12mm;
     color: #425570;
     font-family: "Intro Pro";
     font-size: 1.5em;
     text-transform: uppercase;
 }
 
-.member_number_asociate {
-    margin-left: 52mm;
-    margin-top: 1mm;
-    color: #425570;
+.coop_text {
     font-family: "Intro Pro";
-    font-size: 1.5em;
+    color: #425570;
+    font-size: 13pt;
     text-transform: uppercase;
+    text-orientation: sideways-left;
+    margin-left: 2mm;
+    margin-right: 0;
+    margin-top: -5mm;
+    margin-bottom: 0;
+    padding: 0;
+    -webkit-transform-origin: 260 85;
+    -ms-transform-origin: 255 85;
+    transform-origin: 255 85;
+    -webkit-transform: rotate(-90deg);
+    -ms-transform: rotate(-90deg);
+    transform: rotate(-90deg)
 }
-
-.coop_text {
+.coop_text_asociate {
     font-family: "Intro Pro";
     color: #425570;
     font-size: 13pt;
     text-transform: uppercase;
     text-orientation: sideways-left;
-    margin-left: 1mm;
+    margin-left: 2mm;
     margin-right: 0;
-    margin-top: 0;
+    margin-top: 2mm;
     margin-bottom: 0;
     padding: 0;
     -webkit-transform-origin: 260 85;

diff --git a/coop_print_badge/views/members_config_settings.xml b/coop_print_badge/views/members_config_settings.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_members_config_settings_form" model="ir.ui.view">
-            <field name="name">members.config.settings.form.print.badge</field>
-            <field name="model">members.config.settings</field>
-            <field name="inherit_id" ref="coop_membership.view_members_config_settings_form"/>
+        <record id="view_res_config_settings" model="ir.ui.view">
+            <field name="model">coop_shift.config.settings</field>
+            <field name="inherit_id" ref="coop_membership.view_res_config_settings"/>
             <field name="arch" type="xml">
                 <group name="config_member_section" position="after">
                     <group name="config_badge_print_section" string="Badge Printing">
@@ -14,4 +13,4 @@
             </field>
         </record>
     </data>
-</openerp>
+</openerp>