diff --git a/beesdoo_account/views/account_invoice.xml b/beesdoo_account/views/account_invoice.xml index df3b716..5d019d0 100644 --- a/beesdoo_account/views/account_invoice.xml +++ b/beesdoo_account/views/account_invoice.xml @@ -1,23 +1,23 @@ - - beesdoo.account.invoice.form.view - account.invoice - - - - True - - - + + beesdoo.account.invoice.form.view + account.invoice + + + + True + + + - - beesdoo.account.invoice.supplier.form.view - account.invoice - - - - True - - - + + beesdoo.account.invoice.supplier.form.view + account.invoice + + + + True + + + diff --git a/beesdoo_base/demo/cooperators.xml b/beesdoo_base/demo/cooperators.xml index 9150e25..1d3bcd6 100644 --- a/beesdoo_base/demo/cooperators.xml +++ b/beesdoo_base/demo/cooperators.xml @@ -84,51 +84,51 @@ - + 421457731741 Demo data - - - + + + 429919251493 Demo data - - - + + + 421457731742 Demo data - - - + + + 421457731743 Demo data - - - + + + 421457731744 Demo data - - - + + + 421457731745 Demo data - - - + + + diff --git a/beesdoo_base/report/beescard.xml b/beesdoo_base/report/beescard.xml index d32cac4..122d7a4 100644 --- a/beesdoo_base/report/beescard.xml +++ b/beesdoo_base/report/beescard.xml @@ -1,8 +1,8 @@ + report_type="qweb-html" file="beesdoo_base.beescard_template_cm" + name="beesdoo_base.beescard_template_cm"/> @@ -35,70 +35,74 @@ + style="width: 14.02cm;height: 9.39cm;table-layout:fixed;display: inline-block;"> + style="border-bottom: 1px solid black;width: 0.66cm;height: 0.66cm;"> + style="border-left: 1px solid black;border-right: 1px solid black;" + colspan="2"> + style="border-bottom: 1px solid black;width: 0.66cm;height: 0.66cm;"> + style="border-top: 1px solid black;width: 0.66cm;height: 0.66cm;"> + style="border-left: 1px solid black;border-right: 1px solid black;" + colspan="2"> + style="border-top: 1px solid black;width: 0.66cm;height: 0.66cm;">
+ style="width: 4.98cm;vertical-align:bottom;height: 6.87cm;">
+ style="padding-top:0.2cm;padding-left:0.1cm;padding-bottom:0.2cm;"> Embedded Image + t-att-src="'data:image/png;base64,' + partner.image" + style="width:4.7cm;height:6.4cm"/>
+ style="vertical-align:top;width:7.72cm;height: 6.87cm;position: relative;">

- -
- -
+ +
+ +

- - + + + t-raw="'[' + (partner.parent_eater_id.name[:60] or '') + ']'" + style="font-family:Roboto-Regular"/>

+ t-att-src="'/report/barcode/?type=%s&value=%s&width=%s&height=%s&humanreadable=%s'%('EAN13', partner.barcode if not partner.parent_eater_id else partner.parent_barcode, 340, 70, 1)" + style="width:7.2cm;height:2.52cm"/>
+ style="padding-top:0.2cm;padding-bottom:0.2cm;"> + src="/beesdoo_base/static/src/img/redline.png" + style="width:7.2cm;height:0.2cm"/> + src="/beesdoo_base/static/src/img/blueline.png" + style="width:7.2cm;height:0.2cm"/>
@@ -110,7 +114,8 @@

En cas de perte, + style="text-align:center;font-size:0.8em;font-family:Roboto-Regular"> + En cas de perte, prévenez-nous via membre@bees-coop.be

@@ -119,33 +124,33 @@
+ style="width: 14.02cm;height: 9.39cm;table-layout:fixed;display: inline-block;"> + style="border-bottom: 1px solid black;width: 0.66cm;height: 0.66cm;"> + style="border-left: 1px solid black;border-right: 1px solid black;" + colspan="2"> + style="border-bottom: 1px solid black;width: 0.66cm;height: 0.66cm;"> @@ -153,22 +158,23 @@ + style="border-top: 1px solid black;width: 0.66cm;height: 0.66cm;"> + style="border-left: 1px solid black;border-right: 1px solid black;" + colspan="2"> + style="border-top: 1px solid black;width: 0.66cm;height: 0.66cm;">
+ src="/beesdoo_base/static/src/img/logo.png" + style="display: block;margin-left: auto;margin-right: auto;margin-top:0.2cm;margin-bottom:0.2cm;width:6.46cm;height:6.46cm"/>

www.bees-coop.be + style="text-align:center;font-family:Roboto-Regular;font-size:1.1em;"> + www.bees-coop.be

-
+
diff --git a/beesdoo_base/security/groups.xml b/beesdoo_base/security/groups.xml index 7b2bc1c..d9ef4f2 100644 --- a/beesdoo_base/security/groups.xml +++ b/beesdoo_base/security/groups.xml @@ -2,6 +2,6 @@ Bees Card Force Barcode - + diff --git a/beesdoo_base/views/partner.xml b/beesdoo_base/views/partner.xml index 6a2c6a7..190c47d 100644 --- a/beesdoo_base/views/partner.xml +++ b/beesdoo_base/views/partner.xml @@ -17,47 +17,50 @@ beesdoo.partner.form.view res.partner - + + attrs="{'invisible': [('customer', '=', False)]}"/> + attrs="{'invisible' : [('eater', '!=', 'eater')]}"/> + attrs="{'invisible': ['|', ('customer', '=', False), ('eater', 'not in', ('worker_eater', 'eater'))]}"> - - + + - + + options="{'no_create': True}" + context="{'default_eater' : 'eater', 'default_customer' : True}"/> - - + [('main_seller_id', '=', parent.partner_id)] diff --git a/beesdoo_pos/static/src/xml/templates.xml b/beesdoo_pos/static/src/xml/templates.xml index c72afe8..7ee93eb 100644 --- a/beesdoo_pos/static/src/xml/templates.xml +++ b/beesdoo_pos/static/src/xml/templates.xml @@ -4,11 +4,11 @@
- -
- -
- + +
+ +
+
@@ -18,22 +18,22 @@
- -
- -
- -
- -
+ +
+ +
+ +
+ +
- - + + @@ -53,7 +53,9 @@ - + + + diff --git a/beesdoo_pos/views/beesdoo_pos.xml b/beesdoo_pos/views/beesdoo_pos.xml index f87f2f8..5d82fb0 100644 --- a/beesdoo_pos/views/beesdoo_pos.xml +++ b/beesdoo_pos/views/beesdoo_pos.xml @@ -2,8 +2,9 @@
diff --git a/beesdoo_product/data/barcode_rule.xml b/beesdoo_product/data/barcode_rule.xml index 2c32b2a..1108b6d 100644 --- a/beesdoo_product/data/barcode_rule.xml +++ b/beesdoo_product/data/barcode_rule.xml @@ -1,13 +1,13 @@ - - - Beescoop Product Barcodes - 1 - product - 043 - 45 - ean13 - - - \ No newline at end of file + + + Beescoop Product Barcodes + 1 + product + 043 + 45 + ean13 + + + diff --git a/beesdoo_product/data/product_label.xml b/beesdoo_product/data/product_label.xml index 530c946..f74df8c 100644 --- a/beesdoo_product/data/product_label.xml +++ b/beesdoo_product/data/product_label.xml @@ -1,69 +1,69 @@ - - - Label Bio ou Confiance - eco - #40ff00 - - - Agriculture raisonnée - eco - #ffa200 - - - Conventionnel - eco - #ff4000 - - - Belgique - local - #40ff00 - - - Europe - local - #ffa200 - - - Monde - local - #ff4000 - - - Label par tiers - fair - #40ff00 - - - Préserve l’intérêt - fair - #ffa200 - - - Aucune garantie - fair - #ff4000 - - - Intermédiaire coopératif - delivery - #40ff00 - - - Grossiste biologique - delivery - #ffa200 - - - Grossiste industriel - delivery - #ff4000 - - - Consignes - - - + + + Label Bio ou Confiance + eco + #40ff00 + + + Agriculture raisonnée + eco + #ffa200 + + + Conventionnel + eco + #ff4000 + + + Belgique + local + #40ff00 + + + Europe + local + #ffa200 + + + Monde + local + #ff4000 + + + Label par tiers + fair + #40ff00 + + + Préserve l’intérêt + fair + #ffa200 + + + Aucune garantie + fair + #ff4000 + + + Intermédiaire coopératif + delivery + #40ff00 + + + Grossiste biologique + delivery + #ffa200 + + + Grossiste industriel + delivery + #ff4000 + + + Consignes + + + diff --git a/beesdoo_product/views/assets.xml b/beesdoo_product/views/assets.xml index f729e78..6431370 100644 --- a/beesdoo_product/views/assets.xml +++ b/beesdoo_product/views/assets.xml @@ -2,7 +2,8 @@