Merge 9dbf68d into 3ff2d93

OCA · Aug 10, 2016 · 6066fad · 6066fad
2 parents 3ff2d93 + 9dbf68d
commit 6066fad
Show file tree

Hide file tree

Showing 16 changed files with 321 additions and 332 deletions.
diff --git a/sale_product_set/README.rst b/sale_product_set/README.rst
@@ -1,6 +1,8 @@
 .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-    :alt: License: AGPL-3
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
 
+================
 Sale Product set
 ================
 
@@ -47,11 +49,13 @@ For further information, please visit:
 
 * https://www.odoo.com/forum/help-1
 
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/167/9.0
+
 Known issues / Roadmap
 ======================
 
-*
-
 Bug Tracker
 ===========
 
@@ -60,15 +64,19 @@ 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
 `here <https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_product_set%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
-
 Credits
 =======
 
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
 Contributors
 ------------
 
 * Clovis Nzouendjou <clovis@anybox.fr>
 * Pierre Verkest <pverkest@anybox.fr>
+* Olivier Laurent <olivier.laurent@acsone.eu>
 
 Maintainer
 ----------
@@ -83,4 +91,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-To contribute to this module, please visit http://odoo-community.org.
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/sale_product_set/__init__.py b/sale_product_set/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
 from . import wizard
diff --git a/sale_product_set/__openerp__.py b/sale_product_set/__openerp__.py
@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': 'Sale product set',
-    'category': 'Sale',
-    'author': 'Anybox, Odoo Community Association (OCA)',
-    'version': '8.0.1.0.0',
-    'sequence': 150,
-    'website': 'http://anybox.fr',
     'summary': "Sale product set",
+    'version': '9.0.1.0.0',
+    'category': 'Sales',
+    "website": "https://odoo-community.org/",
+    'author': 'Anybox, Odoo Community Association (OCA)',
+    "license": "AGPL-3",
+    "application": False,
+    "installable": True,
     'depends': [
         'sale',
     ],
@@ -21,7 +23,4 @@
         'demo/product_set.xml',
         'demo/product_set_line.xml',
     ],
-    'installable': False,
-    'application': False,
-    'auto_install': False,
 }
diff --git a/sale_product_set/demo/product_set.xml b/sale_product_set/demo/product_set.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="product_set_i5_computer" model="product.set">
-            <field name="name">i5 computer offer</field>
-        </record>
-        <record id="product_set_services"  model="product.set">
-            <field name="name">Services</field>
-        </record>
-    </data>
-</openerp>
+<odoo noupdate="1">
+    <record id="product_set_i5_computer" model="product.set">
+        <field name="name">i5 computer offer</field>
+    </record>
+    <record id="product_set_services"  model="product.set">
+        <field name="name">Services</field>
+    </record>
+</odoo>
diff --git a/sale_product_set/demo/product_set_line.xml b/sale_product_set/demo/product_set_line.xml
@@ -1,40 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="product_set_line_computer_1" model="product.set.line">
-            <field name="product_set_id" ref="product_set_i5_computer"/>
-            <field name="product_id" ref="product.product_product_5"/>
-            <field name="quantity">1</field>
-            <field name="sequence">30</field>
-        </record>
-        <record id="product_set_line_computer_2" model="product.set.line">
-            <field name="product_set_id" ref="product_set_i5_computer"/>
-            <field name="product_id" ref="product.product_product_21"/>
-            <field name="quantity">1</field>
-            <field name="sequence">10</field>
-        </record>
-        <record id="product_set_line_computer_3" model="product.set.line">
-            <field name="product_set_id" ref="product_set_i5_computer"/>
-            <field name="product_id" ref="product.product_product_22"/>
-            <field name="quantity">1</field>
-            <field name="sequence">50</field>
-        </record>
-        <record id="product_set_line_computer_4" model="product.set.line">
-            <field name="product_set_id" ref="product_set_i5_computer"/>
-            <field name="product_id" ref="product.product_product_13"/>
-            <field name="quantity">2</field>
-            <field name="sequence">20</field>
-        </record>
+<odoo noupdate="1">
+    <record id="product_set_line_computer_1" model="product.set.line">
+        <field name="product_set_id" ref="product_set_i5_computer"/>
+        <field name="product_id" ref="product.product_product_5"/>
+        <field name="quantity">1</field>
+        <field name="sequence">30</field>
+    </record>
+    <record id="product_set_line_computer_2" model="product.set.line">
+        <field name="product_set_id" ref="product_set_i5_computer"/>
+        <field name="product_id" ref="product.product_product_21"/>
+        <field name="quantity">1</field>
+        <field name="sequence">10</field>
+    </record>
+    <record id="product_set_line_computer_3" model="product.set.line">
+        <field name="product_set_id" ref="product_set_i5_computer"/>
+        <field name="product_id" ref="product.product_product_22"/>
+        <field name="quantity">1</field>
+        <field name="sequence">50</field>
+    </record>
+    <record id="product_set_line_computer_4" model="product.set.line">
+        <field name="product_set_id" ref="product_set_i5_computer"/>
+        <field name="product_id" ref="product.product_product_13"/>
+        <field name="quantity">2</field>
+        <field name="sequence">20</field>
+    </record>
 
-        <record id="product_set_line_services_1" model="product.set.line">
-            <field name="product_set_id" ref="product_set_services"/>
-            <field name="product_id" ref="product.product_product_2"/>
-            <field name="quantity">1</field>
-        </record>
-        <record id="product_set_line_services_2" model="product.set.line">
-            <field name="product_set_id" ref="product_set_services"/>
-            <field name="product_id" ref="product.product_product_1"/>
-            <field name="quantity">1</field>
-        </record>
-    </data>
-</openerp>
+    <record id="product_set_line_services_1" model="product.set.line">
+        <field name="product_set_id" ref="product_set_services"/>
+        <field name="product_id" ref="product.product_product_2"/>
+        <field name="quantity">1</field>
+    </record>
+    <record id="product_set_line_services_2" model="product.set.line">
+        <field name="product_set_id" ref="product_set_services"/>
+        <field name="product_id" ref="product.product_product_1"/>
+        <field name="quantity">1</field>
+    </record>
+</odoo>
diff --git a/sale_product_set/i18n/fr.po b/sale_product_set/i18n/fr.po
@@ -4,144 +4,148 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
+"Project-Id-Version: Odoo Server 9.0e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 09:59+0000\n"
-"PO-Revision-Date: 2015-07-29 17:06+0100\n"
-"Last-Translator: Pierre Verkest <pverkest@anybox.fr>\n"
+"POT-Creation-Date: 2016-08-10 11:15+0000\n"
+"PO-Revision-Date: 2016-08-10 11:15+0000\n"
+"Last-Translator: <>\n"
 "Language-Team: \n"
-"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
-"X-Generator: Poedit 1.6.10\n"
 
 #. module: sale_product_set
-#: view:product.set.add:sale_product_set.product_set_add_form_view
-#: view:sale.order:sale_product_set.view_order_stock_form
-msgid "Add set"
-msgstr "Ajout d'un Set"
+#: model:ir.ui.view,arch_db:sale_product_set.view_order_stock_form
+msgid "<span>Add set</span>"
+msgstr "<span>Ajouter un set</span>"
 
 #. module: sale_product_set
-#: model:ir.actions.act_window,name:sale_product_set.act_open_wizard_product_set_add
-msgid "Add set in sale order"
-msgstr "Ajouter un Set"
+#: model:ir.ui.view,arch_db:sale_product_set.product_set_add_form_view
+msgid "Add"
+msgstr "Ajouter"
 
 #. module: sale_product_set
-#: view:product.set.add:sale_product_set.product_set_add_form_view
-msgid "Add set in sale order line"
-msgstr "Ajout d'un Set au devis"
+#: model:ir.actions.act_window,name:sale_product_set.act_open_wizard_product_set_add
+msgid "Add set"
+msgstr "Ajouter un Set"
 
 #. module: sale_product_set
-#: view:product.set.add:sale_product_set.product_set_add_form_view
+#: model:ir.ui.view,arch_db:sale_product_set.product_set_add_form_view
 msgid "Cancel"
 msgstr "Annuler"
 
 #. module: sale_product_set
-#: field:product.set,create_uid:0 field:product.set.add,create_uid:0
-#: field:product.set.line,create_uid:0
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_add_create_uid
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_create_uid
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_line_create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: sale_product_set
-#: field:product.set,create_date:0 field:product.set.add,create_date:0
-#: field:product.set.line,create_date:0
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_add_create_date
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_create_date
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_line_create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: sale_product_set
-#: field:product.set,id:0 field:product.set.add,id:0
-#: field:product.set.line,id:0
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_add_display_name
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_display_name
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_line_display_name
+msgid "Display Name"
+msgstr "Nom affiché"
+
+#. module: sale_product_set
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_add_id
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_id
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_line_id
 msgid "ID"
 msgstr "ID"
 
 #. module: sale_product_set
-#: field:product.set,write_uid:0 field:product.set.add,write_uid:0
-#: field:product.set.line,write_uid:0
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set___last_update
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_add___last_update
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_line___last_update
+msgid "Last Modified on"
+msgstr "Dernière modification le"
+
+#. module: sale_product_set
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_add_write_uid
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_line_write_uid
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_write_uid
 msgid "Last Updated by"
-msgstr "Modifié par"
+msgstr "Mis à jour par"
 
 #. module: sale_product_set
-#: field:product.set,write_date:0 field:product.set.add,write_date:0
-#: field:product.set.line,write_date:0
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_add_write_date
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_line_write_date
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_write_date
 msgid "Last Updated on"
-msgstr "Modifié le"
+msgstr "Mis à jour le"
 
 #. module: sale_product_set
-#: code:addons/sale_product_set/models/product_set.py:9
-#: field:product.set,name:0
-#, python-format
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_name
 msgid "Name"
 msgstr "Nom"
 
 #. module: sale_product_set
-#: code:addons/sale_product_set/models/product_set_line.py:15
-#: field:product.set.line,product_id:0
-#, python-format
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_line_product_id
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: sale_product_set
-#: code:addons/sale_product_set/wizard/product_set_add.py:12
 #: model:ir.actions.act_window,name:sale_product_set.act_open_product_set_view
 #: model:ir.model,name:sale_product_set.model_product_set
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_add_product_set_id
 #: model:ir.ui.menu,name:sale_product_set.menu_product_set
-#: view:product.set:sale_product_set.view_product_set_form
-#: view:product.set:sale_product_set.view_product_set_search
-#: view:product.set:sale_product_set.view_product_set_tree
-#: field:product.set.add,product_set_id:0
-#, python-format
 msgid "Product set"
-msgstr "Set de produit"
+msgstr "Set d'articles"
 
 #. module: sale_product_set
 #: model:ir.model,name:sale_product_set.model_product_set_line
 msgid "Product set line"
 msgstr "ligne du Set"
 
 #. module: sale_product_set
-#: view:product.set:sale_product_set.view_product_set_form
+#: model:ir.ui.view,arch_db:sale_product_set.view_product_set_form
 msgid "Product set lines"
 msgstr "Lignes du Set"
 
 #. module: sale_product_set
-#: code:addons/sale_product_set/models/product_set.py:9
-#: help:product.set,name:0
-#, python-format
+#: model:ir.model.fields,help:sale_product_set.field_product_set_name
 msgid "Product set name"
 msgstr "Nom du Set"
 
 #. module: sale_product_set
-#: code:addons/sale_product_set/models/product_set.py:11
-#: field:product.set,set_line_ids:0
-#, python-format
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_set_line_ids
+#: model:ir.ui.view,arch_db:sale_product_set.view_product_set_form
 msgid "Products"
-msgstr "Produits"
+msgstr "Articles"
 
 #. module: sale_product_set
-#: code:addons/sale_product_set/models/product_set_line.py:17
-#: code:addons/sale_product_set/wizard/product_set_add.py:14
-#: field:product.set.add,quantity:0 field:product.set.line,quantity:0
-#, python-format
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_add_quantity
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_line_quantity
 msgid "Quantity"
 msgstr "Quantité"
 
 #. module: sale_product_set
-#: code:addons/sale_product_set/models/product_set_line.py:23
-#: field:product.set.line,sequence:0
-#, python-format
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_line_sequence
 msgid "Sequence"
 msgstr "Séquence"
 
 #. module: sale_product_set
-#: code:addons/sale_product_set/models/product_set_line.py:21
-#: field:product.set.line,product_set_id:0
-#, python-format
+#: model:ir.model.fields,field_description:sale_product_set.field_product_set_line_product_set_id
 msgid "Set"
 msgstr "Set"
 
 #. module: sale_product_set
-#: view:product.set.add:sale_product_set.product_set_add_form_view
+#: model:ir.model,name:sale_product_set.model_product_set_add
+msgid "Wizard to add product set into a quotation"
+msgstr "Assistant d'ajout d'un set d'articles à un devis"
+
+#. module: sale_product_set
+#: model:ir.ui.view,arch_db:sale_product_set.product_set_add_form_view
 msgid "or"
 msgstr "ou"
+