youssef/GOLEM
2
0
Fork 0
forked from Yaltik/golem
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into resource_pack_quick

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2018-05-25 18:19:03 +02:00
commit e76a516177
4 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golem_resource_report/__manifest__.py
View File

@ -20,7 +20,7 @@
'name': 'GOLEM resources reports', 'name': 'GOLEM resources reports',
'summary': 'GOLEM resources reports', 'summary': 'GOLEM resources reports',
'description': ''' GOLEM resources reports ''', 'description': ''' GOLEM resources reports ''',
'version': '10.0.0.1.0', 'version': '10.0.0.1.1',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Youssef El Ouahby, Fabien Bourgeois', 'author': 'Youssef El Ouahby, Fabien Bourgeois',
'license': 'AGPL-3', 'license': 'AGPL-3',

15
golem_resource_report/i18n/fr.po
View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 10.0\n" "Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-25 14:50+0000\n" "POT-Creation-Date: 2018-05-25 16:13+0000\n"
"PO-Revision-Date: 2018-05-25 14:50+0000\n" "PO-Revision-Date: 2018-05-25 16:13+0000\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -106,7 +106,7 @@ msgid "Print Report"
msgstr "Imprimer le rapport" msgstr "Imprimer le rapport"
#. module: golem_resource_report #. module: golem_resource_report
#: model:ir.ui.menu,name:golem_resource_report.resource_report_menu #: model:ir.ui.menu,name:golem_resource_report.report_menu
msgid "Report" msgid "Report"
msgstr "Rapport" msgstr "Rapport"
@ -115,6 +115,11 @@ msgstr "Rapport"
msgid "Reservations Report" msgid "Reservations Report"
msgstr "Export réservations" msgstr "Export réservations"
#. module: golem_resource_report
#: model:ir.ui.menu,name:golem_resource_report.reservation_resource_day_menu
msgid "Reservations per resource and day"
msgstr "Réservations par ressource et jour"
#. module: golem_resource_report #. module: golem_resource_report
#: model:ir.ui.view,arch_db:golem_resource_report.golem_resource_report_wizard_view_form #: model:ir.ui.view,arch_db:golem_resource_report.golem_resource_report_wizard_view_form
msgid "Resource Report" msgid "Resource Report"
@ -123,10 +128,10 @@ msgstr "Ressource"
#. module: golem_resource_report #. module: golem_resource_report
#: model:ir.model.fields,field_description:golem_resource_report.field_golem_resource_report_wizard_resource_ids #: model:ir.model.fields,field_description:golem_resource_report.field_golem_resource_report_wizard_resource_ids
msgid "Resource ids" msgid "Resource ids"
msgstr "Resources" msgstr "Ressources"
#. module: golem_resource_report #. module: golem_resource_report
#: model:ir.actions.act_window,name:golem_resource_report.golem_resource_report_action #: model:ir.actions.act_window,name:golem_resource_report.reservation_resource_day_action
msgid "Resources Reports" msgid "Resources Reports"
msgstr "Ressources" msgstr "Ressources"

13
golem_resource_report/i18n/golem_resource_report.pot
View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 10.0\n" "Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-25 14:50+0000\n" "POT-Creation-Date: 2018-05-25 16:13+0000\n"
"PO-Revision-Date: 2018-05-25 14:50+0000\n" "PO-Revision-Date: 2018-05-25 16:13+0000\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -105,7 +105,7 @@ msgid "Print Report"
msgstr "" msgstr ""
#. module: golem_resource_report #. module: golem_resource_report
#: model:ir.ui.menu,name:golem_resource_report.resource_report_menu #: model:ir.ui.menu,name:golem_resource_report.report_menu
msgid "Report" msgid "Report"
msgstr "" msgstr ""
@ -114,6 +114,11 @@ msgstr ""
msgid "Reservations Report" msgid "Reservations Report"
msgstr "" msgstr ""
#. module: golem_resource_report
#: model:ir.ui.menu,name:golem_resource_report.reservation_resource_day_menu
msgid "Reservations per resource and day"
msgstr ""
#. module: golem_resource_report #. module: golem_resource_report
#: model:ir.ui.view,arch_db:golem_resource_report.golem_resource_report_wizard_view_form #: model:ir.ui.view,arch_db:golem_resource_report.golem_resource_report_wizard_view_form
msgid "Resource Report" msgid "Resource Report"
@ -125,7 +130,7 @@ msgid "Resource ids"
msgstr "" msgstr ""
#. module: golem_resource_report #. module: golem_resource_report
#: model:ir.actions.act_window,name:golem_resource_report.golem_resource_report_action #: model:ir.actions.act_window,name:golem_resource_report.reservation_resource_day_action
msgid "Resources Reports" msgid "Resources Reports"
msgstr "" msgstr ""

9
golem_resource_report/views/golem_resource_report_menu.xml
View File

@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<data> <data>
<!-- Actions --> <!-- Actions -->
<record model="ir.actions.act_window" id="golem_resource_report_action"> <record model="ir.actions.act_window" id="reservation_resource_day_action">
<field name="name">Resources Reports</field> <field name="name">Resources Reports</field>
<field name="res_model">golem.resource.report.wizard</field> <field name="res_model">golem.resource.report.wizard</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -31,8 +31,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</record> </record>
<!-- Menus --> <!-- Menus -->
<menuitem id="resource_report_menu" name="Report" parent="golem_resource.golem_resource_menu" <menuitem id="report_menu" name="Report"
action="golem_resource_report_action" sequence="10" /> parent="golem_resource.golem_resource_menu" sequence="80" />
<menuitem id="reservation_resource_day_menu"
name="Reservations per resource and day" parent="report_menu"
action="reservation_resource_day_action" sequence="10" />
</data> </data>
</odoo> </odoo>