Merge PR #1054 into 12.0

Signed-off-by pedrobaeza
OCA · Jan 24, 2020 · 48f08e5 · 48f08e5
2 parents 6de66ea + 8d36ef4
commit 48f08e5
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 17 deletions.
diff --git a/sale_elaboration/i18n/es.po b/sale_elaboration/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-04 14:59+0000\n"
-"PO-Revision-Date: 2019-12-04 16:01+0100\n"
+"POT-Creation-Date: 2020-01-24 11:48+0000\n"
+"PO-Revision-Date: 2020-01-24 12:49+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -20,23 +20,33 @@ msgstr ""
 #. module: sale_elaboration
 #: model_terms:ir.ui.view,arch_db:sale_elaboration.report_delivery_document
 msgid "<strong>Elab.</strong>"
-msgstr ""
+msgstr "<strong>Elab.</strong>"
 
 #. module: sale_elaboration
 #: model_terms:ir.ui.view,arch_db:sale_elaboration.report_delivery_document
 msgid "<strong>Elaboration</strong>"
 msgstr "<strong>Elaboración</strong>"
 
+#. module: sale_elaboration
+#: model:ir.model.fields,field_description:sale_elaboration.field_product_elaboration__active
+msgid "Active"
+msgstr "Activo"
+
 #. module: sale_elaboration
 #: model_terms:ir.ui.view,arch_db:sale_elaboration.view_sales_order_line_filter
 msgid "After Date"
-msgstr ""
+msgstr "Después de"
 
 #. module: sale_elaboration
 #: sql_constraint:product.elaboration:0
 msgid "Code must be unique!"
 msgstr "El código debe ser único!"
 
+#. module: sale_elaboration
+#: model:ir.model.fields,field_description:sale_elaboration.field_sale_order_line__confirmation_date
+msgid "Confirmation Date"
+msgstr "Fecha de confirmación"
+
 #. module: sale_elaboration
 #: model:ir.model.fields,field_description:sale_elaboration.field_product_elaboration__create_uid
 msgid "Created by"
@@ -47,11 +57,6 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado el"
 
-#. module: sale_elaboration
-#: model:ir.model.fields,field_description:sale_elaboration.field_sale_order_line__confirmation_date
-msgid "Date"
-msgstr "Fecha"
-
 #. module: sale_elaboration
 #: model:ir.model.fields,help:sale_elaboration.field_sale_order_line__confirmation_date
 msgid "Date on which the sales order is confirmed."
@@ -91,6 +96,14 @@ msgstr "Búsqueda de elaboraciones"
 msgid "ID"
 msgstr "ID (identificación)"
 
+#. module: sale_elaboration
+#: model:ir.model.fields,help:sale_elaboration.field_product_elaboration__active
+msgid ""
+"If unchecked, it will allow you to hide the product elaborations without "
+"removing it."
+msgstr ""
+"Si no está marcado, permitirá ocultar la elaboración sin eliminarla."
+
 #. module: sale_elaboration
 #: model:ir.model.fields,field_description:sale_elaboration.field_sale_order_line__is_elaboration
 #: model_terms:ir.ui.view,arch_db:sale_elaboration.view_sales_order_line_filter
@@ -175,8 +188,8 @@ msgstr "Nombre corto"
 msgid "Transfer"
 msgstr "Transferir"
 
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
 #~ msgid "Quotation"
 #~ msgstr "Presupuesto"
-
-#~ msgid "Confirmation Date"
-#~ msgstr "Fecha de confirmación"
diff --git a/sale_elaboration/i18n/sale_elaboration.pot b/sale_elaboration/i18n/sale_elaboration.pot
@@ -6,6 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-01-24 11:48+0000\n"
+"PO-Revision-Date: 2020-01-24 11:48+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -23,6 +25,11 @@ msgstr ""
 msgid "<strong>Elaboration</strong>"
 msgstr ""
 
+#. module: sale_elaboration
+#: model:ir.model.fields,field_description:sale_elaboration.field_product_elaboration__active
+msgid "Active"
+msgstr ""
+
 #. module: sale_elaboration
 #: model_terms:ir.ui.view,arch_db:sale_elaboration.view_sales_order_line_filter
 msgid "After Date"
@@ -33,6 +40,11 @@ msgstr ""
 msgid "Code must be unique!"
 msgstr ""
 
+#. module: sale_elaboration
+#: model:ir.model.fields,field_description:sale_elaboration.field_sale_order_line__confirmation_date
+msgid "Confirmation Date"
+msgstr ""
+
 #. module: sale_elaboration
 #: model:ir.model.fields,field_description:sale_elaboration.field_product_elaboration__create_uid
 msgid "Created by"
@@ -43,11 +55,6 @@ msgstr ""
 msgid "Created on"
 msgstr ""
 
-#. module: sale_elaboration
-#: model:ir.model.fields,field_description:sale_elaboration.field_sale_order_line__confirmation_date
-msgid "Date"
-msgstr ""
-
 #. module: sale_elaboration
 #: model:ir.model.fields,help:sale_elaboration.field_sale_order_line__confirmation_date
 msgid "Date on which the sales order is confirmed."
@@ -87,6 +94,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: sale_elaboration
+#: model:ir.model.fields,help:sale_elaboration.field_product_elaboration__active
+msgid "If unchecked, it will allow you to hide the product elaborations without removing it."
+msgstr ""
+
 #. module: sale_elaboration
 #: model:ir.model.fields,field_description:sale_elaboration.field_sale_order_line__is_elaboration
 #: model_terms:ir.ui.view,arch_db:sale_elaboration.view_sales_order_line_filter

diff --git a/sale_elaboration/models/product_elaboration.py b/sale_elaboration/models/product_elaboration.py
@@ -22,6 +22,12 @@ class Elaboration(models.Model):
         domain=[('type', '=', 'service'), ('is_elaboration', '=', True)],
         required=True,
     )
+    active = fields.Boolean(
+        string='Active',
+        default=True,
+        help='If unchecked, it will allow you to hide the product '
+             'elaborations without removing it.',
+    )
 
     _sql_constraints = [
         ('name_uniq', 'unique(name)', 'Name must be unique!'),

diff --git a/sale_elaboration/views/sale_elaboration_views.xml b/sale_elaboration/views/sale_elaboration_views.xml
@@ -27,6 +27,7 @@
                 <field name="code"/>
                 <field name="name"/>
                 <field name="product_id" context="{'default_is_elaboration': True, 'default_type': 'service'}"/>
+                <field name="active" invisible="1"/>
             </tree>
         </field>
     </record>