[REF][IMP]GOLEM Family Card templates refactoring

This commit is contained in:
Fabien BOURGEOIS 2018-03-17 15:20:59 +01:00
parent 2a3b17d354
commit 4fada24ac7
6 changed files with 221 additions and 127 deletions

View File

@ -25,7 +25,9 @@
'application': False,
'installable': True,
'depends': ['golem_member'],
'data': ['security/ir.model.access.csv', 'views/golem_family_views.xml',
'views/golem_member_views.xml', 'views/res_partner_views.xml',
'report/golem_family_report.xml']
'data': ['security/ir.model.access.csv',
'views/golem_family_views.xml',
'views/golem_member_views.xml',
'views/res_partner_views.xml',
'report/golem_member_card_templates.xml']
}

View File

@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-01-29 14:59+0000\n"
"PO-Revision-Date: 2018-01-29 14:59+0000\n"
"POT-Creation-Date: 2018-03-17 14:14+0000\n"
"PO-Revision-Date: 2018-03-17 14:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -32,6 +32,11 @@ msgstr "0000000000"
msgid "Address"
msgstr "Adresse"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Address :"
msgstr "Adresse :"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_search
msgid "By city"
@ -48,6 +53,7 @@ msgid "City"
msgstr "Ville"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
#: model:ir.ui.view,arch_db:golem_family.golem_family_form
#: model:ir.ui.view,arch_db:golem_family.golem_member_form_inherit_golem_family
msgid "Communication"
@ -71,6 +77,11 @@ msgstr "Nombre"
msgid "Country"
msgstr "Pays"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Country :"
msgstr "Pays :"
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_family_create_uid
#: model:ir.model.fields,field_description:golem_family.field_golem_family_role_create_uid
@ -83,6 +94,11 @@ msgstr "Créé par"
msgid "Created on"
msgstr "Créé le"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Details"
msgstr "Détails"
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_family_display_name
#: model:ir.model.fields,field_description:golem_family.field_golem_family_role_display_name
@ -107,6 +123,7 @@ msgstr "Familles"
#: model:ir.model.fields,field_description:golem_family.field_golem_member_family_id
#: model:ir.model.fields,field_description:golem_family.field_res_partner_family_id
#: model:ir.model.fields,field_description:golem_family.field_res_users_family_id
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
#: model:ir.ui.view,arch_db:golem_family.golem_family_form
#: model:ir.ui.view,arch_db:golem_family.golem_member_form_inherit_golem_family
msgid "Family"
@ -159,6 +176,16 @@ msgstr "Liste des rôles familiaux"
msgid "GOLEM Member"
msgstr "Adhérent"
#. module: golem_family
#: model:ir.actions.report.xml,name:golem_family.golem_family_report_html
msgid "Golem family report [HTML]"
msgstr "Cartes adhérents des membres [HTML]"
#. module: golem_family
#: model:ir.actions.report.xml,name:golem_family.golem_family_report_pdf
msgid "Golem family report [PDF]"
msgstr "Cartes adhérents des membres [PDF]"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_search
msgid "Group By"
@ -188,6 +215,11 @@ msgstr "Dernière mise à jour par"
msgid "Last Updated on"
msgstr "Dernière mise à jour le"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Mail :"
msgstr "Mail :"
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_family_member_ids
#: model:ir.model.fields,field_description:golem_family.field_golem_member_family_member_ids
@ -204,6 +236,11 @@ msgstr "Adhérents"
msgid "Mobile"
msgstr "Mobile"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Mobile :"
msgstr "Portable :"
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_family_name
#: model:ir.ui.view,arch_db:golem_family.golem_family_form
@ -233,6 +270,11 @@ msgstr "Partenaire"
msgid "Phone"
msgstr "Téléphone"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Phone :"
msgstr "Téléphone :"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_member_form_inherit_golem_family
msgid "Please save new member before assigning a family."
@ -266,6 +308,11 @@ msgstr "Roles"
msgid "State"
msgstr "Région"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "State :"
msgstr "Région :"
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_family_street
#: model:ir.model.fields,field_description:golem_family.field_golem_member_family_street
@ -296,6 +343,11 @@ msgstr "Complément de rue"
msgid "Website"
msgstr "Site Web"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Website :"
msgstr "Site Web :"
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_form
#: model:ir.ui.view,arch_db:golem_family.golem_member_form_inherit_golem_family

View File

@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-01-29 09:03+0000\n"
"PO-Revision-Date: 2018-01-29 09:03+0000\n"
"POT-Creation-Date: 2018-03-17 14:12+0000\n"
"PO-Revision-Date: 2018-03-17 14:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -32,6 +32,11 @@ msgstr ""
msgid "Address"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Adress :"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_search
msgid "By city"
@ -48,6 +53,7 @@ msgid "City"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
#: model:ir.ui.view,arch_db:golem_family.golem_family_form
#: model:ir.ui.view,arch_db:golem_family.golem_member_form_inherit_golem_family
msgid "Communication"
@ -55,6 +61,9 @@ msgstr ""
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_family_count
#: model:ir.model.fields,field_description:golem_family.field_golem_member_family_count
#: model:ir.model.fields,field_description:golem_family.field_res_partner_family_count
#: model:ir.model.fields,field_description:golem_family.field_res_users_family_count
msgid "Count"
msgstr ""
@ -68,6 +77,11 @@ msgstr ""
msgid "Country"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Country :"
msgstr ""
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_family_create_uid
#: model:ir.model.fields,field_description:golem_family.field_golem_family_role_create_uid
@ -80,6 +94,11 @@ msgstr ""
msgid "Created on"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Details"
msgstr ""
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_family_display_name
#: model:ir.model.fields,field_description:golem_family.field_golem_family_role_display_name
@ -102,26 +121,17 @@ msgstr ""
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_member_family_id
#: model:ir.model.fields,field_description:golem_family.field_golem_member_family_member
#: model:ir.model.fields,field_description:golem_family.field_res_partner_family_id
#: model:ir.model.fields,field_description:golem_family.field_res_partner_family_member
#: model:ir.model.fields,field_description:golem_family.field_res_users_family_id
#: model:ir.model.fields,field_description:golem_family.field_res_users_family_member
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
#: model:ir.ui.view,arch_db:golem_family.golem_family_form
#: model:ir.ui.view,arch_db:golem_family.golem_family_search_inherit_golem_membership
#: model:ir.ui.view,arch_db:golem_family.golem_member_form_inherit_golem_family
msgid "Family"
msgstr ""
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_member_family_count
#: model:ir.model.fields,field_description:golem_family.field_res_partner_family_count
#: model:ir.model.fields,field_description:golem_family.field_res_users_family_count
msgid "Family Count"
msgstr ""
#. module: golem_family
#: code:addons/golem_family/models/golem_family.py:49
#: code:addons/golem_family/models/golem_family.py:84
#: code:addons/golem_family/models/golem_family.py:48
#: code:addons/golem_family/models/golem_family.py:82
#, python-format
msgid "Family Members"
msgstr ""
@ -133,7 +143,6 @@ msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_form
#: model:ir.ui.view,arch_db:golem_family.golem_member_form_inherit_golem_family
msgid "Family members"
msgstr ""
@ -167,6 +176,16 @@ msgstr ""
msgid "GOLEM Member"
msgstr ""
#. module: golem_family
#: model:ir.actions.report.xml,name:golem_family.golem_family_report_html
msgid "Golem family report [HTML]"
msgstr ""
#. module: golem_family
#: model:ir.actions.report.xml,name:golem_family.golem_family_report_pdf
msgid "Golem family report [PDF]"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_search
msgid "Group By"
@ -196,8 +215,14 @@ msgstr ""
msgid "Last Updated on"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Mail :"
msgstr ""
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_family_member_ids
#: model:ir.model.fields,field_description:golem_family.field_golem_member_family_member_ids
#: model:ir.model.fields,field_description:golem_family.field_res_partner_family_member_ids
#: model:ir.model.fields,field_description:golem_family.field_res_users_family_member_ids
msgid "Members"
@ -211,6 +236,11 @@ msgstr ""
msgid "Mobile"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Mobile :"
msgstr ""
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_family_name
#: model:ir.ui.view,arch_db:golem_family.golem_family_form
@ -240,6 +270,16 @@ msgstr ""
msgid "Phone"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Phone :"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_member_form_inherit_golem_family
msgid "Please save new member before assigning a family."
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_form
msgid "Put an internal note..."
@ -268,6 +308,11 @@ msgstr ""
msgid "State"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "State :"
msgstr ""
#. module: golem_family
#: model:ir.model.fields,field_description:golem_family.field_golem_family_street
#: model:ir.model.fields,field_description:golem_family.field_golem_member_family_street
@ -298,6 +343,11 @@ msgstr ""
msgid "Website"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_card_template
msgid "Website :"
msgstr ""
#. module: golem_family
#: model:ir.ui.view,arch_db:golem_family.golem_family_form
#: model:ir.ui.view,arch_db:golem_family.golem_member_form_inherit_golem_family

View File

@ -1,19 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
# Copyright 2018 Michel Dessenne <michel@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/>.
from . import golem_family

View File

@ -1,87 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
Copyright 2018 Michel Dessenne <michel@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>
<record id="paperformat_euro_Portrait"
model="report.paperformat">
<field name="name">European A4 Portrait</field>
<field name="default" eval="True" />
<field name="format">A4</field>
<field name="page_height">0</field>
<field name="page_width">0</field>
<field name="orientation">Portrait</field>
<field name="margin_top">40</field>
<field name="margin_bottom">23</field>
<field name="margin_left">7</field>
<field name="margin_right">7</field>
<field name="header_line" eval="True" />
<field name="header_spacing">35</field>
<field name="dpi">90</field>
</record>
<report id="golem_family_report"
string="Golem family report"
model="golem.family"
report_type="qweb-pdf"
name="golem_family.report_golem_family_template" />
<template id="report_golem_family_template">
<t t-call="report.html_container">
<t t-call="report.external_layout">
<div class="page">
<t t-foreach="docs" t-as="o">
<div class="oe_structure"/>
<div class="row">
<div class="col-xs-4">
<strong>Family</strong>
<br></br>
<strong><span t-field="o.name" /></strong><br></br>
<span t-field="o.street" /><br></br>
<t t-if="o.street2">
<span t-field="o.street2" /><br></br>
</t>
<span t-field="o.zip" /><br></br>
<span t-field="o.city" /><br></br>
<t t-if="o.state_id">
<span t-field="o.state_id" /><br></br>
</t>
<span t-field="o.country_id" /><br></br>
</div>
</div>
</t>
</div>
<t t-foreach="docs" t-as="o">
<t t-foreach="o.member_ids" t-as="i" >
<!-- <div class="page"> -->
<t t-call="golem_member.report_golem_member_template" >
<t t-set="docs" t-value="i.member_id" />
</t>
<!-- </div> -->
</t>
</t>
</t>
</t>
</template>
</odoo>

View File

@ -0,0 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2018 Fabien Bourgeois <fabien@yaltik.com>
Copyright 2018 Michel Dessenne <michel@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>
<report id="golem_family_report_pdf" model="golem.family"
string="Golem family report [PDF]" report_type="qweb-pdf"
name="golem_family.golem_family_card_template"
file="golem_family.golem_family_card_template"
attachment="(object.name + '.pdf')" />
<report id="golem_family_report_html" model="golem.family"
string="Golem family report [HTML]" report_type="qweb-html"
name="golem_family.golem_family_card_template"
file="golem_family.golem_family_card_template"
attachment="(object.name + '.html')" />
<template id="golem_family_card_template">
<t t-call="report.html_container">
<t t-call="report.external_layout">
<div class="page">
<t t-foreach="docs" t-as="o">
<div class="oe_structure"/>
<div class="row">
<h2>Family <span t-field="o.name" /></h2>
</div>
<div class="row">
<div class="col-xs-6">
<h3>Details</h3>
<t if="o.city">
Address :
<span t-field="o.street" /><br />
<t t-if="o.street2">
<span t-field="o.street2" /><br />
</t>
<span t-field="o.zip" />
<span t-field="o.city" /><br /><br />
</t>
<t t-if="o.state_id">
State :
<span t-field="o.state_id" /><br />
</t>
<t t-if="o.country_id">
Country :
<span t-field="o.country_id" />
</t>
</div>
<div class="col-xs-6">
<h3>Communication</h3>
<t t-if="o.phone">
Phone : <span t-field="o.phone" /><br />
</t>
<t t-if="o.mobile">
Mobile : <span t-field="o.mobile" /><br />
</t>
<t t-if="o.email">
Mail : <span t-field="o.email" /><br />
</t>
<t t-if="o.website">
Website : <span t-field="o.website" /><br />
</t>
</div>
</div>
</t>
</div>
<t t-foreach="docs" t-as="o">
<t t-foreach="o.member_ids" t-as="i" >
<t t-call="golem_member.golem_member_card_template" >
<t t-set="docs" t-value="i.member_id" />
</t>
</t>
</t>
</t>
</t>
</template>
</odoo>