Merge branch '10.0' of https://github.com/CybroOdoo/CybroAddons into 10.0

vouchers_pos/data/product_data.xml

@@ -3,9 +3,9 @@
     <record model="product.product" id="gift_product_pos">
         <field name="name">Gift-Coupon</field>
         <field name="display_name">Gift-Coupon</field>
-        <field name="avilable_in_pos">True</field>
+        <field name="available_in_pos">True</field>
         <field name="type">service</field>
         <field name="taxes_id"></field>
         <field name="supplier_taxes_id"></field>
     </record>
-</odoo>
+</odoo>

website_coupon/i18n/fr.po

@@ -2,13 +2,13 @@
 # This file contains the translation of the following modules:
 #	* website_coupon
 #
-# Xavier Brochard <xavier@alternatif.org>, 2017.
+# Xavier Brochard <xavier@alternatif.org>, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0-20171109\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-17 11:24+0000\n"
-"PO-Revision-Date: 2017-11-17 15:04+0100\n"
+"PO-Revision-Date: 2018-09-26 19:37+0100\n"
 "Last-Translator: Xavier Brochard <xavier@alternatif.org>\n"
 "Language-Team: French <>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 #. module: website_coupon
 #: model:ir.ui.view,arch_db:website_coupon.cart_lines_extended
 msgid "<small><i class=\"fa fa-trash-o\"/> Remove</small>"
-msgstr "<small><i class=\"fa fa-trash-o\"/> Enlever</small>"
+msgstr "<small><i class=\"fa fa-trash-o\"/> Supprimer</small>"
 
 #. module: website_coupon
 #: selection:gift.voucher,voucher_type:0
@@ -36,7 +36,7 @@ msgstr "Valable sur"
 #. module: website_coupon
 #: model:ir.ui.view,arch_db:website_coupon.applied_coupons_view
 msgid "Applied Coupons"
-msgstr ""
+msgstr "Codes promo utilisés"
 
 #. module: website_coupon
 #: model:ir.ui.view,arch_db:website_coupon.voucher_code
@@ -61,7 +61,7 @@ msgstr "Restrictions obligatoires"
 #. module: website_coupon
 #: model:ir.model.fields,field_description:website_coupon.field_partner_coupon_coupon
 msgid "Coupon Applied"
-msgstr "Code utilisé"
+msgstr "Code promo utilisé"
 
 #. module: website_coupon
 #: model:ir.ui.menu,name:website_coupon.gift_coupon_history
@@ -72,7 +72,7 @@ msgstr "Utilisation"
 #: model:ir.model.fields,field_description:website_coupon.field_res_partner_applied_coupon
 #: model:ir.model.fields,field_description:website_coupon.field_res_users_applied_coupon
 msgid "Coupons Applied"
-msgstr ""
+msgstr "Codes promo utilisés"
 
 #. module: website_coupon
 #: model:ir.model.fields,field_description:website_coupon.field_gift_coupon_create_uid
@@ -125,7 +125,7 @@ msgstr "Code promotionel"
 #. module: website_coupon
 #: model:ir.ui.menu,name:website_coupon.gift_coupon_main
 msgid "Gift Coupons"
-msgstr "Codes promo"
+msgstr "Promotions"
 
 #. module: website_coupon
 #: model:ir.actions.act_window,name:website_coupon.action_gift_coupon_history
@@ -135,7 +135,7 @@ msgstr "Promotions utilisées"
 #. module: website_coupon
 #: model:ir.ui.menu,name:website_coupon.gift_voucher
 msgid "Gift Voucher"
-msgstr "Promotions autorisées"
+msgstr "Promotion autorisée"
 
 #. module: website_coupon
 #: model:ir.actions.act_window,name:website_coupon.action_gift_voucher
@@ -178,7 +178,7 @@ msgstr ""
 #. module: website_coupon
 #: model:ir.model.fields,field_description:website_coupon.field_gift_coupon_partner_id
 msgid "Limit to a Single Partner"
-msgstr "Limiter au contact"
+msgstr "Limité au contact"
 
 #. module: website_coupon
 #: model:ir.model.fields,field_description:website_coupon.field_gift_voucher_max_value
@@ -217,7 +217,7 @@ msgstr "Pourcentage"
 #: code:addons/website_coupon/models/gift_voucher.py:77
 #, python-format
 msgid "Please check the voucher value"
-msgstr ""
+msgstr "Vérifiez la valeur de calcul autorisée"
 
 #. module: website_coupon
 #: model:ir.ui.view,arch_db:website_coupon.cart_lines_extended
@@ -255,7 +255,7 @@ msgstr "Débute le"
 #. module: website_coupon
 #: model:ir.ui.view,arch_db:website_coupon.voucher_code
 msgid "The discount amount is too large"
-msgstr ""
+msgstr "La réduction est trop grande"
 
 #. module: website_coupon
 #: model:ir.ui.view,arch_db:website_coupon.voucher_code
@@ -265,12 +265,12 @@ msgstr "Ce code n'est pas valable"
 #. module: website_coupon
 #: model:ir.model.fields,field_description:website_coupon.field_gift_coupon_total_avail
 msgid "Total Available"
-msgstr "Quantité totale disponible"
+msgstr "Quantité disponible"
 
 #. module: website_coupon
 #: model:ir.model.fields,field_description:website_coupon.field_gift_coupon_limit
 msgid "Total Available For Each User"
-msgstr "Quantité maxi par personne"
+msgstr "Quantité max par personne"
 
 #. module: website_coupon
 #: model:ir.model.fields,field_description:website_coupon.field_gift_coupon_type

website_sale_advanced_search/controllers/main.py

@@ -18,6 +18,7 @@ class WebsiteSearch(http.Controller):
         category = int(kw.get('category')) if not kw.get('category') == 'all' else ''
         try:
             domain = [('public_categ_ids', 'child_of', [category])] if category else []
+            domain.append(('website_published','=', True))
             product_as_category = request.env['product.template'].search(domain)
             sql = """select id as res_id, name as name, name as value from product_template where name ILIKE %s"""
             extra_query = ''