Merge branch '14.0' into 14.0-mig-shopinvader_import_image

akretion · Mar 26, 2021 · b15bd3a · b15bd3a
2 parents 2a22f5d + 12f2953
commit b15bd3a
Show file tree

Hide file tree

Showing 28 changed files with 1,291 additions and 565 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,7 +16,6 @@ exclude: |
   ^shopinvader_demo_app/|
   ^shopinvader_elasticsearch/|
   ^shopinvader_guest_mode/|
-  ^shopinvader_image/|
   ^shopinvader_lead/|
   ^shopinvader_locomotive/|
   ^shopinvader_locomotive_algolia/|

diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ addon | version | summary
 [base_url](base_url/) | 14.0.1.0.0 | keep history of url for products & categories
 [shopinvader](shopinvader/) | 14.0.1.1.2 | Shopinvader
 [shopinvader_cart_expiry](shopinvader_cart_expiry/) | 14.0.1.0.0 | Shopinvader module to manage an expiry delay on cart
+[shopinvader_image](shopinvader_image/) | 14.0.1.0.0 | Add the export of Image for Shopinvader
 [shopinvader_invoice](shopinvader_invoice/) | 14.0.1.1.1 | Shopinvader Invoice module
 [shopinvader_multi_category](shopinvader_multi_category/) | 14.0.1.0.0 | Shopinvader Many Categories
 [shopinvader_product_variant_selector](shopinvader_product_variant_selector/) | 14.0.1.0.0 | Ease creation of variants selector on shopinvader sites
@@ -48,7 +49,6 @@ addon | version | summary
 [shopinvader_demo_app](shopinvader_demo_app/) | 12.0.2.0.4 (unported) | Shopinvader Demo App
 [shopinvader_elasticsearch](shopinvader_elasticsearch/) | 13.0.1.0.1 (unported) | Shopinvader Elasticsearch Connector
 [shopinvader_guest_mode](shopinvader_guest_mode/) | 13.0.1.1.0 (unported) | Guest mode for Shopinvader
-[shopinvader_image](shopinvader_image/) | 13.0.1.0.1 (unported) | Add the export of Image for Shopinvader
 [shopinvader_import_image](shopinvader_import_image/) | 13.0.3.0.0 (unported) | Import product images
 [shopinvader_lead](shopinvader_lead/) | 13.0.1.0.1 (unported) | Shopinvader Lead Management
 [shopinvader_locomotive](shopinvader_locomotive/) | 13.0.2.1.0 (unported) | Manage communications between Shopinvader and Locomotive CMS

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-14.0.20210326.4
+14.0.20210326.5
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
@@ -11,6 +11,7 @@
         'odoo14-addon-base_url',
         'odoo14-addon-shopinvader',
         'odoo14-addon-shopinvader_cart_expiry',
+        'odoo14-addon-shopinvader_image',
         'odoo14-addon-shopinvader_invoice',
         'odoo14-addon-shopinvader_multi_category',
         'odoo14-addon-shopinvader_product_variant_selector',

diff --git a/setup/shopinvader_image/odoo/addons/shopinvader_image b/setup/shopinvader_image/odoo/addons/shopinvader_image
@@ -0,0 +1 @@
+../../../../shopinvader_image
diff --git a/setup/shopinvader_image/setup.py b/setup/shopinvader_image/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/shopinvader/i18n/shopinvader.pot b/shopinvader/i18n/shopinvader.pot
@@ -1463,6 +1463,16 @@ msgstr ""
 msgid "Fail Mail"
 msgstr ""
 
+#. module: shopinvader
+#: model:product.product,name:shopinvader.product_product_armchair_mid_century_blue
+#: model:product.product,name:shopinvader.product_product_armchair_mid_century_grey
+#: model:product.product,name:shopinvader.product_product_armchair_mid_century_red
+#: model:product.product,name:shopinvader.product_product_armchair_mid_century_yellow
+#: model:product.product,name:shopinvader.product_product_table_walmut
+#: model:product.template,name:shopinvader.product_template_armchair_mid_century
+msgid "Fauteuil Style Mid-Century avec assise tapissée"
+msgstr ""
+
 #. module: shopinvader
 #: model:ir.model.fields,field_description:shopinvader.field_shopinvader_config_settings__module_delivery_fedex
 msgid "FedEx Connector"
@@ -1769,6 +1779,7 @@ msgid ""
 msgstr ""
 
 #. module: shopinvader
+#: model:ir.model.fields,field_description:shopinvader.field_shopinvader_category__image_ids
 #: model:ir.model.fields,field_description:shopinvader.field_shopinvader_partner__image_1920
 #: model:ir.model.fields,field_description:shopinvader.field_shopinvader_product__image_1920
 #: model:ir.model.fields,field_description:shopinvader.field_shopinvader_variant__image_1920
@@ -1803,6 +1814,24 @@ msgstr ""
 msgid "Image 512"
 msgstr ""
 
+#. module: shopinvader
+#: model:ir.model.fields,field_description:shopinvader.field_shopinvader_product__image_medium_url
+#: model:ir.model.fields,field_description:shopinvader.field_shopinvader_variant__image_medium_url
+msgid "Image Medium Url"
+msgstr ""
+
+#. module: shopinvader
+#: model:ir.model.fields,field_description:shopinvader.field_shopinvader_product__image_small_url
+#: model:ir.model.fields,field_description:shopinvader.field_shopinvader_variant__image_small_url
+msgid "Image Small Url"
+msgstr ""
+
+#. module: shopinvader
+#: model:ir.model.fields,field_description:shopinvader.field_shopinvader_product__image_ids
+#: model:ir.model.fields,field_description:shopinvader.field_shopinvader_variant__image_ids
+msgid "Images"
+msgstr ""
+
 #. module: shopinvader
 #: model:ir.model.fields,field_description:shopinvader.field_shopinvader_config_settings__module_account_bank_statement_import_qif
 msgid "Import .qif files"
@@ -4215,6 +4244,21 @@ msgstr ""
 msgid "Variant Image 512"
 msgstr ""
 
+#. module: shopinvader
+#: model:ir.model.fields,field_description:shopinvader.field_shopinvader_variant__variant_image_medium_url
+msgid "Variant Image Medium Url"
+msgstr ""
+
+#. module: shopinvader
+#: model:ir.model.fields,field_description:shopinvader.field_shopinvader_variant__variant_image_small_url
+msgid "Variant Image Small Url"
+msgstr ""
+
+#. module: shopinvader
+#: model:ir.model.fields,field_description:shopinvader.field_shopinvader_variant__variant_image_ids
+msgid "Variant Images"
+msgstr ""
+
 #. module: shopinvader
 #: model:ir.model.fields,field_description:shopinvader.field_shopinvader_variant__price_extra
 msgid "Variant Price Extra"
@@ -4277,18 +4321,6 @@ msgstr ""
 msgid "Vortex Side Chair"
 msgstr ""
 
-#. module: shopinvader
-#: model:product.product,name:shopinvader.product_product_armchair_mid_century_blue
-#: model:product.product,name:shopinvader.product_product_armchair_mid_century_grey
-#: model:product.product,name:shopinvader.product_product_armchair_mid_century_red
-#: model:product.product,name:shopinvader.product_product_armchair_mid_century_yellow
-#: model:product.product,name:shopinvader.product_product_table_walmut
-#: model:product.template,name:shopinvader.product_template_armchair_mid_century
-msgid ""
-"Walnut Side End Table Nightstand with Storage Drawer Solid Wood Legs Living Room Furniture\n"
-"        "
-msgstr ""
-
 #. module: shopinvader
 #: model:ir.model.fields,field_description:shopinvader.field_shopinvader_config_settings__group_warning_account
 msgid "Warnings in Invoices"

diff --git a/shopinvader_image/README.rst b/shopinvader_image/README.rst
@@ -14,7 +14,7 @@ Shopinvader image
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-shopinvader%2Fodoo--shopinvader-lightgray.png?logo=github
-    :target: https://github.com/shopinvader/odoo-shopinvader/tree/13.0/shopinvader_image
+    :target: https://github.com/shopinvader/odoo-shopinvader/tree/14.0/shopinvader_image
     :alt: shopinvader/odoo-shopinvader
 
 |badge1| |badge2| |badge3| 
@@ -68,7 +68,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/shopinvader/odoo-shopinvader/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/shopinvader/odoo-shopinvader/issues/new?body=module:%20shopinvader_image%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/shopinvader/odoo-shopinvader/issues/new?body=module:%20shopinvader_image%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -92,6 +92,6 @@ Contributors
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `shopinvader/odoo-shopinvader <https://github.com/shopinvader/odoo-shopinvader/tree/13.0/shopinvader_image>`_ project on GitHub.
+This module is part of the `shopinvader/odoo-shopinvader <https://github.com/shopinvader/odoo-shopinvader/tree/14.0/shopinvader_image>`_ project on GitHub.
 
 You are welcome to contribute.
diff --git a/shopinvader_image/__manifest__.py b/shopinvader_image/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Shopinvader image",
     "summary": "Add the export of Image for Shopinvader",
-    "version": "13.0.1.0.1",
+    "version": "14.0.1.0.0",
     "category": "e-commerce",
     "website": "https://github.com/shopinvader/odoo-shopinvader",
     "author": "Akretion",
@@ -23,6 +23,6 @@
         "demo/storage_image_product_image_tag_demo.xml",
         "demo/backend_demo.xml",
     ],
-    "installable": False,
+    "installable": True,
     "post_init_hook": "post_init_hook",
 }
diff --git a/shopinvader_image/data/ir_export_category.xml b/shopinvader_image/data/ir_export_category.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
 
     <record id="ir_exp_shopinvader_category_images" model="ir.exports.line">
         <field name="name">images</field>
-        <field name="export_id" ref="shopinvader.ir_exp_shopinvader_category"/>
+        <field name="export_id" ref="shopinvader.ir_exp_shopinvader_category" />
     </record>
 
 </odoo>
diff --git a/shopinvader_image/data/ir_export_product.xml b/shopinvader_image/data/ir_export_product.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
 
     <record id="ir_exp_shopinvader_variant_images" model="ir.exports.line">
         <field name="name">images</field>
-        <field name="export_id" ref="shopinvader.ir_exp_shopinvader_variant"/>
+        <field name="export_id" ref="shopinvader.ir_exp_shopinvader_variant" />
     </record>
 
 </odoo>
diff --git a/shopinvader_image/data/shopinvader_image_resize.xml b/shopinvader_image/data/shopinvader_image_resize.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
 
     <record id="small" model="shopinvader.image.resize">

diff --git a/shopinvader_image/demo/backend_demo.xml b/shopinvader_image/demo/backend_demo.xml
@@ -1,9 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
 
     <record id="shopinvader.backend_1" model="shopinvader.backend">
-        <field name="shopinvader_variant_resize_ids" eval="[(6, 0, [ref('small'), ref('medium'), ref('large')])]"/>
-        <field name="shopinvader_category_resize_ids" eval="[(6, 0, [ref('small'), ref('medium')])]"/>
+        <field
+            name="shopinvader_variant_resize_ids"
+            eval="[(6, 0, [ref('small'), ref('medium'), ref('large')])]"
+        />
+        <field
+            name="shopinvader_category_resize_ids"
+            eval="[(6, 0, [ref('small'), ref('medium')])]"
+        />
     </record>
 
 </odoo>