[PYTHON][VIEW] +event duration and sale order and invoices links in registration...

diff --git a/i18n/fr.po b/i18n/fr.po
index 51aa813..2381163 100644 (file)
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-18 09:01+0000\n"
-"PO-Revision-Date: 2020-05-18 11:04+0200\n"
+"POT-Creation-Date: 2020-05-25 14:02+0000\n"
+"PO-Revision-Date: 2020-05-25 16:04+0200\n"
 "Last-Translator: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -65,6 +65,16 @@ msgstr "Salarié·e"
 msgid "Invoiced/Paid/Free and Individuals"
 msgstr "Individu·es facturé·es/payé·es/libres"
 
+#. module: lhc
+#: field:event.registration,invoice_ids:0
+msgid "Related invoice(s)"
+msgstr "Facture(s) associée(s)"
+
+#. module: lhc
+#: view:event.registration:0
+msgid "Invoicing"
+msgstr "Facturation"
+
 #. module: lhc
 #: model:res.groups,name:lhc.group_rencontres
 msgid "Annual meeting organisation"
@@ -85,6 +95,12 @@ msgstr "Source de financement principale"
 msgid "Event Registration"
 msgstr "Inscriptions"
 
+#. module: lhc
+#: selection:event.registration,position:0
+#: model:res.groups,name:lhc.group_volunteer
+msgid "Volunteer"
+msgstr "Bénévole"
+
 #. module: lhc
 #: model:ir.module.category,description:lhc.module_category_lhc
 msgid "Customize OpenERP for L'Heureux Cyclage usages."
@@ -98,10 +114,9 @@ msgid "Projects"
 msgstr "Projets"
 
 #. module: lhc
-#: selection:event.registration,position:0
-#: model:res.groups,name:lhc.group_volunteer
-msgid "Volunteer"
-msgstr "Bénévole"
+#: view:event.registration:0
+msgid "Other general informations"
+msgstr "Autres informations"
 
 #. module: lhc
 #: view:account.invoice:0
@@ -123,6 +138,11 @@ msgstr "Contact fréquent"
 msgid "Gender"
 msgstr "Genre"
 
+#. module: lhc
+#: field:event.registration,sale_order_ids:0
+msgid "Related sale order(s)"
+msgstr "Devis associé(s)"
+
 #. module: lhc
 #: model:res.groups,name:lhc.group_ca
 msgid "Administration board members"
@@ -158,6 +178,11 @@ msgstr "Homme"
 msgid "Others fundings origins"
 msgstr "Autres sources de financement"
 
+#. module: lhc
+#: help:event.event,duration:0
+msgid "Duration in hours"
+msgstr "Durée en heures"
+
 #. module: lhc
 #: model:ir.module.category,name:lhc.module_category_lhc
 msgid "L'Heureux Cyclage"
@@ -168,6 +193,11 @@ msgstr "L'Heureux Cyclage"
 msgid "Invividual"
 msgstr "Individuel·le"
 
+#. module: lhc
+#: model:ir.model,name:lhc.model_event_event
+msgid "Event"
+msgstr "Événement"
+
 #. module: lhc
 #: model:ir.ui.menu,name:lhc.menu_rencontres_2016
 msgid "Rencontres 2016"
@@ -193,16 +223,31 @@ msgstr "Femme"
 msgid "Pole Emploi"
 msgstr "Pôle Emploi"
 
+#. module: lhc
+#: field:event.event,duration:0
+msgid "Duration"
+msgstr "Durée"
+
 #. module: lhc
 #: view:hr.expense.expense:0
 msgid "Move number"
 msgstr "Numéro de pièce comptable"
 
+#. module: lhc
+#: model:ir.model,name:lhc.model_sale_order
+msgid "Sales Order"
+msgstr "Devis"
+
 #. module: lhc
 #: view:res.partner:0
 msgid "All Individual Members"
 msgstr "Tou·tes les membres individuel·les"
 
+#. module: lhc
+#: model:ir.model,name:lhc.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Ligne de devis"
+
 #. module: lhc
 #: view:res.partner:0
 msgid "Invoiced/Paid/Free and Companies"

diff --git a/i18n/lhc.pot b/i18n/lhc.pot
index bb46be2..fd16e2a 100644 (file)
--- a/i18n/lhc.pot
+++ b/i18n/lhc.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-18 09:01+0000\n"
-"PO-Revision-Date: 2020-05-18 09:01+0000\n"
+"POT-Creation-Date: 2020-05-25 14:02+0000\n"
+"PO-Revision-Date: 2020-05-25 14:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -60,6 +60,16 @@ msgstr ""
 msgid "Invoiced/Paid/Free and Individuals"
 msgstr ""
 
+#. module: lhc
+#: field:event.registration,invoice_ids:0
+msgid "Related invoice(s)"
+msgstr ""
+
+#. module: lhc
+#: view:event.registration:0
+msgid "Invoicing"
+msgstr ""
+
 #. module: lhc
 #: model:res.groups,name:lhc.group_rencontres
 msgid "Annual meeting organisation"
@@ -80,6 +90,12 @@ msgstr ""
 msgid "Event Registration"
 msgstr ""
 
+#. module: lhc
+#: selection:event.registration,position:0
+#: model:res.groups,name:lhc.group_volunteer
+msgid "Volunteer"
+msgstr ""
+
 #. module: lhc
 #: model:ir.module.category,description:lhc.module_category_lhc
 msgid "Customize OpenERP for L'Heureux Cyclage usages."
@@ -93,9 +109,8 @@ msgid "Projects"
 msgstr ""
 
 #. module: lhc
-#: selection:event.registration,position:0
-#: model:res.groups,name:lhc.group_volunteer
-msgid "Volunteer"
+#: view:event.registration:0
+msgid "Other general informations"
 msgstr ""
 
 #. module: lhc
@@ -118,6 +133,11 @@ msgstr ""
 msgid "Gender"
 msgstr ""
 
+#. module: lhc
+#: field:event.registration,sale_order_ids:0
+msgid "Related sale order(s)"
+msgstr ""
+
 #. module: lhc
 #: model:res.groups,name:lhc.group_ca
 msgid "Administration board members"
@@ -153,6 +173,11 @@ msgstr ""
 msgid "Others fundings origins"
 msgstr ""
 
+#. module: lhc
+#: help:event.event,duration:0
+msgid "Duration in hours"
+msgstr ""
+
 #. module: lhc
 #: model:ir.module.category,name:lhc.module_category_lhc
 msgid "L'Heureux Cyclage"
@@ -163,6 +188,11 @@ msgstr ""
 msgid "Invividual"
 msgstr ""
 
+#. module: lhc
+#: model:ir.model,name:lhc.model_event_event
+msgid "Event"
+msgstr ""
+
 #. module: lhc
 #: model:ir.ui.menu,name:lhc.menu_rencontres_2016
 msgid "Rencontres 2016"
@@ -188,16 +218,31 @@ msgstr ""
 msgid "Pole Emploi"
 msgstr ""
 
+#. module: lhc
+#: field:event.event,duration:0
+msgid "Duration"
+msgstr ""
+
 #. module: lhc
 #: view:hr.expense.expense:0
 msgid "Move number"
 msgstr ""
 
+#. module: lhc
+#: model:ir.model,name:lhc.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
 #. module: lhc
 #: view:res.partner:0
 msgid "All Individual Members"
 msgstr ""
 
+#. module: lhc
+#: model:ir.model,name:lhc.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
 #. module: lhc
 #: view:res.partner:0
 msgid "Invoiced/Paid/Free and Companies"

diff --git a/lhc.py b/lhc.py
index 420ce97..fc2c4dc 100644 (file)
--- a/lhc.py
+++ b/lhc.py
@@ -31,7 +31,12 @@ class res_partner(orm.Model):
     _inherit = 'res.partner'
 
     _columns = {
-        'usual_contact': fields.boolean('Usual contact', help='This contact is a usual contact for L\'Heureux Cyclage employees. This field can be used to discriminated contacts for differents usages.'),
+        'usual_contact': fields.boolean(
+            'Usual contact',
+            help="""This contact is a usual contact for L\'Heureux Cyclage
+            employees. This field can be used to discriminated contacts for
+            differents usages."""
+        ),
         'kit_sent': fields.boolean('Welcome kit sent'),
     }
 
@@ -44,7 +49,13 @@ class product_template(orm.Model):
     _inherit = 'product.template'
 
     _columns = {
-        'standard_price': fields.float('Cost', digits_compute=dp.get_precision('Product Price'), help="Cost price of the product used for standard stock valuation in accounting and used as a base price on purchase orders.", groups="base.group_user,lhc.group_volunteer"),
+        'standard_price': fields.float(
+            'Cost',
+            digits_compute=dp.get_precision('Product Price'),
+            help="""Cost price of the product used for standard stock valuation
+            in accounting and used as a base price on purchase orders.",
+            groups="base.group_user,lhc.group_volunteer"""
+        ),
     }
 
 
@@ -65,6 +76,18 @@ class res_users(orm.Model):
         return {'value': v}
 
 
+class event_event(orm.Model):
+    _inherit = 'event.event'
+
+    _columns = {
+        'duration': fields.float(
+            'Duration',
+            digits_compute=dp.get_precision('Product Unit of Measure'),
+            help='Duration in hours'
+        ),
+    }
+
+
 class event_registration(orm.Model):
     _inherit = 'event.registration'
 
@@ -86,6 +109,20 @@ class event_registration(orm.Model):
             ('pole_emploi', 'Pole Emploi')],
             'Main funding', help='Main funding origin'),
         'fundings_others': fields.char('Others fundings origins', size=128),
+        'sale_order_ids': fields.many2many(
+            'sale.order',
+            'event_registration_sale_order_rel',
+            'event_registration_id',
+            'sale_order_id',
+            'Related sale order(s)'
+        ),
+        'invoice_ids': fields.many2many(
+            'account.invoice',
+            'event_registration_invoice_id_rel',
+            'event_registration_id',
+            'invoice_id',
+            'Related invoice(s)'
+        ),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/view/event.xml b/view/event.xml
index 60b97f0..38ba6ef 100644 (file)
--- a/view/event.xml
+++ b/view/event.xml
@@ -4,6 +4,17 @@
         <record id="event.act_event_list_register_event" model="ir.actions.act_window">
             <field name="view_mode">tree,form,graph</field>
         </record>
+        <record id="view_event_form" model="ir.ui.view">
+            <field name="name">event.event.form</field>
+            <field name="model">event.event</field>
+            <field name="inherit_id" ref="event.view_event_form"/>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date_end']" position="after">
+                    <field name="duration" widget="float_time"/>
+                </xpath>
+            </field>
+        </record>
         <record id="view_event_registration_form" model="ir.ui.view">
             <field name="name">event.registration.form</field>
             <field name="model">event.registration</field>
@@ -11,16 +22,35 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_id']/.." position="after">
-                    <group colspan="4">
-                        <group>
-                            <field name="gender"/>
-                            <field name="position"/>
-                        </group>
-                        <group>
-                            <field name="funding_main"/>
-                            <field name="fundings_others"/>
-                        </group>
-                    </group>
+                    <notebook colspan="4">
+                        <page string="Other general informations">
+                            <group colspan="4">
+                                <group>
+                                    <field name="gender"/>
+                                    <field name="position"/>
+                                </group>
+                                <group>
+                                    <field name="funding_main"/>
+                                    <field name="fundings_others"/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Invoicing">
+                            <group colspan="4">
+                                <field name="sale_order_ids"/>
+                                <field name="invoice_ids">
+                                    <tree>
+                                        <field name="number"/>
+                                        <field name="date_invoice"/>
+                                        <field name="partner_id"/>
+                                        <field name="user_id"/>
+                                        <field name="amount_total"/>
+                                        <field name="state"/>
+                                    </tree>
+                                </field>
+                            </group>
+                        </page>
+                    </notebook>
                 </xpath>
             </field>
         </record>