Merge branch 'master' into Add_reservation_to_existing_invoice

2018-04-16 16:53:47 +02:00 · 2018-04-16 16:53:47 +02:00 · 720500a4f7
parent 4712b3e689 408ae9a8c3
commit 720500a4f7
7 changed files with 165 additions and 22 deletions
--- a/golem_resource/manifest.py
+++ b/golem_resource/manifest.py
@ -20,7 +20,7 @@
    'name': 'GOLEM non-profit resources',
    'summary': 'GOLEM resources management',
    'description': ''' GOLEM resources management ''',
-    'version': '10.0.1.13.1',
+    'version': '10.0.1.13.2',
    'category': 'GOLEM',
    'author': 'Youssef El Ouahby, Fabien Bourgeois',
    'license': 'AGPL-3',
@ -32,5 +32,6 @@
             'views/golem_resource_reservation_views.xml',
             'views/golem_resource_timetable_views.xml',
             'wizard/golem_reservation_rejection_views.xml',
-             'security/ir.model.access.csv']
+             'security/ir.model.access.csv',
+             'views/product_template_views.xml']
 }
--- a/golem_resource/i18n/fr.po
+++ b/golem_resource/i18n/fr.po
@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-26 15:36+0000\n"
-"PO-Revision-Date: 2018-03-26 15:36+0000\n"
+"POT-Creation-Date: 2018-04-16 14:29+0000\n"
+"PO-Revision-Date: 2018-04-16 14:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@ -21,6 +21,16 @@ msgstr ""
 msgid "24/7 availibility"
 msgstr "Disponibilité 24h/24 7j/7"

+#. module: golem_resource
+#: model:ir.ui.view,arch_db:golem_resource.golem_resource_reservation_view_search
+msgid "30 Days Reservations"
+msgstr "Dans les 30 jours"
+
+#. module: golem_resource
+#: model:ir.ui.view,arch_db:golem_resource.golem_resource_reservation_view_search
+msgid "7 Days Reservations"
+msgstr "Dans les 7 jours"
+
 #. module: golem_resource
 #: model:ir.model.fields,help:golem_resource.field_golem_resource_product_tmpl_id
 msgid "A generic product can be linked, in order to sell reservations (work in progress)"
@ -123,6 +133,11 @@ msgstr "Créé le"
 msgid "Day"
 msgstr "Jour"

+#. module: golem_resource
+#: model:ir.ui.view,arch_db:golem_resource.golem_resource_reservation_view_search
+msgid "Day Reservation"
+msgstr "Démarre ce jour"
+
 #. module: golem_resource
 #: model:ir.model.fields,field_description:golem_resource.field_golem_resource_reservation_day_start
 msgid "Day start"
@ -228,6 +243,11 @@ msgstr "Dernière mise à jour par"
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"

+#. module: golem_resource
+#: model:ir.ui.view,arch_db:golem_resource.product_template_search_inherit_resource_view
+msgid "Linked To A Resource"
+msgstr "Lié à une ressource"
+
 #. module: golem_resource
 #: model:ir.model.fields,field_description:golem_resource.field_golem_resource_product_tmpl_id
 #: model:ir.ui.view,arch_db:golem_resource.golem_resource_view_search
@ -313,6 +333,16 @@ msgstr "Merci de saisir le motif du refus"
 msgid "Please save the resource before fixing the timetable availibility\""
 msgstr "Merci de sauvegarder la ressource avant de pouvoir définir ses disponibilités\""

+#. module: golem_resource
+#: model:ir.model,name:golem_resource.model_product_template
+msgid "Product Template"
+msgstr "Modèle d'article"
+
+#. module: golem_resource
+#: model:ir.actions.act_window,name:golem_resource.golem_resource_product_action
+msgid "Products"
+msgstr "Articles"
+
 #. module: golem_resource
 #: model:ir.model.fields,field_description:golem_resource.field_golem_reservation_rejection_wizard_reason
 msgid "Reason"
@ -366,6 +396,11 @@ msgstr "Réservations"
 msgid "Resource"
 msgstr "Ressource"

+#. module: golem_resource
+#: model:ir.ui.menu,name:golem_resource.product_template_menu
+msgid "Resource Products"
+msgstr "Articles liés à des ressources"
+
 #. module: golem_resource
 #: code:addons/golem_resource/models/golem_resource.py:64
 #, python-format
@ -379,7 +414,7 @@ msgid "Resource Reservation list"
 msgstr "Liste des réservations"

 #. module: golem_resource
-#: model:ir.model.fields,field_description:golem_resource.field_golem_resource_type_id_4449
+#: model:ir.model.fields,field_description:golem_resource.field_golem_resource_type_id_4023
 #: model:ir.model.fields,field_description:golem_resource.field_golem_resource_type_name
 msgid "Resource Type"
 msgstr "Type de ressource"
@ -390,6 +425,12 @@ msgstr "Type de ressource"
 msgid "Resource Types"
 msgstr "Types de ressource"

+#. module: golem_resource
+#: model:ir.model.fields,field_description:golem_resource.field_product_product_resource_ids
+#: model:ir.model.fields,field_description:golem_resource.field_product_template_resource_ids
+msgid "Resource ids"
+msgstr "Ressources"
+
 #. module: golem_resource
 #: sql_constraint:golem.resource.type:0
 msgid "Resource type must be unique."
@ -409,11 +450,6 @@ msgstr "Ressources"
 msgid "Saturday"
 msgstr "Samedi"

-#. module: golem_resource
-#: model:ir.ui.menu,name:golem_resource.product_template_menu
-msgid "Sellable Products"
-msgstr "Articles en vente"
-
 #. module: golem_resource
 #: model:ir.ui.view,arch_db:golem_resource.golem_resource_reservation_view_form
 msgid "Set to draft"
--- a/golem_resource/i18n/golem_resource.pot
+++ b/golem_resource/i18n/golem_resource.pot
@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-26 15:37+0000\n"
-"PO-Revision-Date: 2018-03-26 15:37+0000\n"
+"POT-Creation-Date: 2018-04-16 14:29+0000\n"
+"PO-Revision-Date: 2018-04-16 14:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@ -21,6 +21,16 @@ msgstr ""
 msgid "24/7 availibility"
 msgstr ""

+#. module: golem_resource
+#: model:ir.ui.view,arch_db:golem_resource.golem_resource_reservation_view_search
+msgid "30 Days Reservations"
+msgstr ""
+
+#. module: golem_resource
+#: model:ir.ui.view,arch_db:golem_resource.golem_resource_reservation_view_search
+msgid "7 Days Reservations"
+msgstr ""
+
 #. module: golem_resource
 #: model:ir.model.fields,help:golem_resource.field_golem_resource_product_tmpl_id
 msgid "A generic product can be linked, in order to sell reservations (work in progress)"
@ -123,6 +133,11 @@ msgstr ""
 msgid "Day"
 msgstr ""

+#. module: golem_resource
+#: model:ir.ui.view,arch_db:golem_resource.golem_resource_reservation_view_search
+msgid "Day Reservation"
+msgstr ""
+
 #. module: golem_resource
 #: model:ir.model.fields,field_description:golem_resource.field_golem_resource_reservation_day_start
 msgid "Day start"
@ -228,6 +243,11 @@ msgstr ""
 msgid "Last Updated on"
 msgstr ""

+#. module: golem_resource
+#: model:ir.ui.view,arch_db:golem_resource.product_template_search_inherit_resource_view
+msgid "Linked To A Resource"
+msgstr ""
+
 #. module: golem_resource
 #: model:ir.model.fields,field_description:golem_resource.field_golem_resource_product_tmpl_id
 #: model:ir.ui.view,arch_db:golem_resource.golem_resource_view_search
@ -313,6 +333,16 @@ msgstr ""
 msgid "Please save the resource before fixing the timetable availibility\""
 msgstr ""

+#. module: golem_resource
+#: model:ir.model,name:golem_resource.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: golem_resource
+#: model:ir.actions.act_window,name:golem_resource.golem_resource_product_action
+msgid "Products"
+msgstr ""
+
 #. module: golem_resource
 #: model:ir.model.fields,field_description:golem_resource.field_golem_reservation_rejection_wizard_reason
 msgid "Reason"
@ -366,6 +396,11 @@ msgstr ""
 msgid "Resource"
 msgstr ""

+#. module: golem_resource
+#: model:ir.ui.menu,name:golem_resource.product_template_menu
+msgid "Resource Products"
+msgstr ""
+
 #. module: golem_resource
 #: code:addons/golem_resource/models/golem_resource.py:64
 #, python-format
@ -379,7 +414,7 @@ msgid "Resource Reservation list"
 msgstr ""

 #. module: golem_resource
-#: model:ir.model.fields,field_description:golem_resource.field_golem_resource_type_id_4449
+#: model:ir.model.fields,field_description:golem_resource.field_golem_resource_type_id_4023
 #: model:ir.model.fields,field_description:golem_resource.field_golem_resource_type_name
 msgid "Resource Type"
 msgstr ""
@ -390,6 +425,12 @@ msgstr ""
 msgid "Resource Types"
 msgstr ""

+#. module: golem_resource
+#: model:ir.model.fields,field_description:golem_resource.field_product_product_resource_ids
+#: model:ir.model.fields,field_description:golem_resource.field_product_template_resource_ids
+msgid "Resource ids"
+msgstr ""
+
 #. module: golem_resource
 #: sql_constraint:golem.resource.type:0
 msgid "Resource type must be unique."
@ -409,11 +450,6 @@ msgstr ""
 msgid "Saturday"
 msgstr ""

-#. module: golem_resource
-#: model:ir.ui.menu,name:golem_resource.product_template_menu
-msgid "Sellable Products"
-msgstr ""
-
 #. module: golem_resource
 #: model:ir.ui.view,arch_db:golem_resource.golem_resource_reservation_view_form
 msgid "Set to draft"
--- a/golem_resource/models/init.py
+++ b/golem_resource/models/init.py
@ -19,4 +19,5 @@
 from . import golem_resource_type, \
    golem_resource_timetable, \
    golem_resource, \
-    golem_resource_reservation
+    golem_resource_reservation, \
+    product_template
--- a/golem_resource/models/product_template.py
+++ b/golem_resource/models/product_template.py
@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
+#    Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+""" Product Template """
+
+from odoo import models, fields
+
+class ProductTemplate(models.Model):
+    """ Product Template Resource Adaptation """
+    _inherit = "product.template"
+
+    resource_ids = fields.One2many('golem.resource', 'product_tmpl_id')
--- a/golem_resource/views/golem_resource_views.xml
+++ b/golem_resource/views/golem_resource_views.xml
@ -135,9 +135,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    <menuitem id="resource_configuration_menu" name="Configuration"
      parent="golem_resource_menu" groups="golem_base.group_golem_manager"
      sequence="90" />
-    <menuitem id="product_template_menu" name="Sellable Products"
-      parent="resource_configuration_menu"
-      action="product.product_template_action" sequence="20" />

  </data>
 </odoo>
--- a/golem_resource/views/product_template_views.xml
+++ b/golem_resource/views/product_template_views.xml
@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
+Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<odoo>
+  <data>
+
+    <!-- Search -->
+    <record id="product_template_search_inherit_resource_view" model="ir.ui.view">
+      <field name="name">product.template.inherit.resource.search</field>
+      <field name="model">product.template</field>
+      <field name="inherit_id" ref='product.product_template_search_view' />
+      <field name="arch" type="xml">
+        <filter name="filter_to_sell" position="after">
+          <filter string="Linked To A Resource" name="filter_resource_linked" domain="[('resource_ids','!=',False)]"/>
+        </filter>
+      </field>
+    </record>
+
+    <!-- Actions -->
+    <act_window id="golem_resource_product_action" name="Products"
+      res_model="product.template" view_mode="kanban,tree,form"
+      context="{'search_default_filter_resource_linked': 1}" />
+
+    <!-- Menus -->
+    <menuitem id="product_template_menu" name="Resource Products"
+      parent="resource_configuration_menu"
+      action="golem_resource_product_action" sequence="20" />
+      
+  </data>
+</odoo>