From 06a4bef378d6fd9b1af728f148c4830f4f86403d Mon Sep 17 00:00:00 2001 From: Benjamin <benjamin@le-filament.com> Date: Fri, 20 Mar 2020 18:02:01 +0100 Subject: [PATCH] [cgscop #146] impression feuille de temps paysage + ajout description + ajour visa --- report/report_hr_timesheet.xml | 36 +++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/report/report_hr_timesheet.xml b/report/report_hr_timesheet.xml index bf9070f..dc75eec 100644 --- a/report/report_hr_timesheet.xml +++ b/report/report_hr_timesheet.xml @@ -46,6 +46,7 @@ <td><span t-field="line.date"/></td> <td><span t-field="line.project_id"/></td> <td><span t-field="line.partner_id"/></td> + <td><span t-field="line.name"/></td> <td><span t-field="line.ur_financial_system_id"/></td> <td class="text-right"><span t-field="line.unit_amount" t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"/></td> </tr> @@ -54,12 +55,29 @@ <td /> <td /> <td /> + <td /> <td class="text-right"><strong>Total</strong></td> <td class="text-right"><strong t-esc="o.total_hour" t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"/></td> </tr> </tbody> </table> <div t-if="o.state == 'draft'">Cette feuille de temps a été éditée en brouillon.</div> + <div t-else=""> + <table style="float: right;"> + <tr> + <td style="width: 300px; border-bottom: 1px solid #495057; text-align: center;"> + Visa salarié + </td> + <td style="width: 300px; border-bottom: 1px solid #495057; text-align: center;"> + Visa direction + </td> + </tr> + <tr> + <td><br/><br/><br/></td> + <td><br/><br/><br/></td> + </tr> + </table> + </div> </div> </t> </template> @@ -72,14 +90,30 @@ </t> </template> + <!-- Paper format --> + <record id="cgscop_paperformat_a4_landscape" model="report.paperformat"> + <field name="name">A4 Paysage</field> + <field name="default" eval="True"/> + <field name="format">A4</field> + <field name="orientation">Landscape</field> + <field name="margin_top">10</field> + <field name="margin_bottom">25</field> + <field name="margin_left">10</field> + <field name="margin_right">10</field> + <field name="header_line" eval="False"/> + <field name="header_spacing">0</field> + <field name="dpi">90</field> + </record> + <!-- QWeb Reports --> <report id="cgscop_timesheet_sheet_report" model="cgscop.timesheet.sheet" - string="Feuille de Temps" + string="CG Scop - Feuille de Temps" report_type="qweb-pdf" name="cgscop_timesheet.report_timesheet_sheet" file="cgscop_timesheet.report_timesheet_sheet" + paperformat="cgscop_paperformat_a4_landscape" menu="False" /> -- GitLab