Merge lp:~camptocamp/hr-timesheet/6.1-hr_timesheet_print-wrong_dependency into lp:~hr-core-editors/hr-timesheet/6.1

[Guewen Baconnier @ Camptocamp]

[FIX] hr_timesheet_print requires hr_timesheet_invoice, backport the changes done for the 7.0 migration

Most of the changes are styling issues.
Corrected a wrong copyright attribution and changed the license to AGPLv3

fix lp:1089267

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

[lp:~camptocamp/hr-timesheet/6.1-hr_timesheet_print-wrong_dependency]

39. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-12-12

[IMP] backport the changes done for the 7.0 migration

Most of the changes are styling issues.
Corrected a wrong copyright attribution and changed the license to AGPLv3

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I updated my merge with all the others changes done on https://code.launchpad.net/~c2c/hr-timesheet/7.0-hr_timesheet_print-migr/+merge/139416

They are compatible with version 6.1

review: Needs Resubmitting

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Abstain

=== modified file 'hr_timesheet_print/__init__.py'
--- hr_timesheet_print/__init__.py	2011-08-12 12:33:12 +0000
+++ hr_timesheet_print/__init__.py	2012-12-12 10:37:22 +0000
@@ -1,27 +1,21 @@
-# -*- coding: utf-8 -*- 
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-# @author Renaville Vincent, ported by Joel Grand-Guillaume
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Vincent Renaville
+#    Copyright 2012 Camptocamp SA
+#
+#    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/>.
 #
 ##############################################################################
 import report
 
=== modified file 'hr_timesheet_print/__openerp__.py'
--- hr_timesheet_print/__openerp__.py	2011-08-12 12:33:12 +0000
+++ hr_timesheet_print/__openerp__.py	2012-12-12 10:37:22 +0000
@@ -1,26 +1,21 @@
-# -*- coding: utf-8 -*- 
+# -*- coding: utf-8 -*-
 ##############################################################################
-## @author Bessi Nicolas, ported by Joel Grand-Guillaume
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+#    Author: Nicolas Bessi, ported by Joel Grand-Guillaume
+#    Copyright 2012 Camptocamp SA
+#
+#    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/>.
 #
 ##############################################################################
 
@@ -31,13 +26,14 @@
 detailed of hours passed.
 
  """,
-    "version" : "1.2",
+    "version" : "1.3",
     "author" : "Camptocamp",
     "category" : "Generic Modules/Projects & Services",
     "website": "http://www.camptocamp.com",
+    "license": 'AGPL-3',
     "depends" : [
         "analytic",
-        "hr_timesheet",
+        "hr_timesheet_invoice",
         ],
     "init_xml" : [],
     "update_xml" : [
 
=== modified file 'hr_timesheet_print/report.xml'
--- hr_timesheet_print/report.xml	2011-08-12 12:33:12 +0000
+++ hr_timesheet_print/report.xml	2012-12-12 10:37:22 +0000
@@ -3,13 +3,13 @@
     <data>
 
         <report id="timesheet_hours_report"
-               string="Timesheet report"
+               string="Timesheet Report"
                model="hr.analytic.timesheet"
                name="hr.analytic.timesheet.report"
                rml="hr_timesheet_print/report/timesheet_report.rml"/>
 
          <report id="timesheet_hours_report_aal"
-               string="Timesheet report"
+               string="Timesheet Report"
                model="account.analytic.line"
                name="analytic.line.timesheet.report"
                rml="hr_timesheet_print/report/timesheet_report.rml"/>
 
=== modified file 'hr_timesheet_print/report/__init__.py'
--- hr_timesheet_print/report/__init__.py	2011-08-12 12:33:12 +0000
+++ hr_timesheet_print/report/__init__.py	2012-12-12 10:37:22 +0000
@@ -1,27 +1,20 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-import timesheet_report
 \ No newline at end of file
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2012 Camptocamp SA
+#
+#    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/>.
+#
+##############################################################################
+import timesheet_report
 
=== modified file 'hr_timesheet_print/report/timesheet_report.py'
--- hr_timesheet_print/report/timesheet_report.py	2011-09-23 08:28:16 +0000
+++ hr_timesheet_print/report/timesheet_report.py	2012-12-12 10:37:22 +0000
@@ -1,39 +1,30 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Copyright 2012 Camptocamp SA
+#
+#    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/>.
 #
 ##############################################################################
 
 import time
-from datetime import *
-from report import report_sxw
-
-#import xml.dom.minidom
-#import re
+from datetime import datetime
+from openerp.report import report_sxw
 
 
 class timesheet_report(report_sxw.rml_parse):
+
     def __init__(self, cr, uid, name, context=None):
         super(timesheet_report, self).__init__(cr, uid, name, context)
         self.localcontext.update({
@@ -42,11 +33,11 @@
         })
         self.context = context
 
-    def set_context(self, objects, data, ids, report_type = None):
-        super(timesheet_report,self).set_context(objects,data,ids,report_type)
+    def set_context(self, objects, data, ids, report_type=None):
         self.localcontext['ts_lines'] = objects
         self.localcontext['tot_hours'] = self._get_tot_hours(objects)
-        
+        super(timesheet_report, self).set_context(objects, data, ids, report_type)
+
     def _get_tot_hours(self, ts_lines):
         tot = 0.0
         deduced = 0.0
@@ -60,22 +51,19 @@
             factor_invoicing = 1.0
             if line.to_invoice and line.to_invoice.factor != 0.0:
                 factor_invoicing = 1.0 - line.to_invoice.factor / 100
-            # deduced += ((line.unit_amount / factor) * factor_invoicing)
             if factor_invoicing > 1.0:
                 deduced += ((line.unit_amount / factor) * factor_invoicing)
                 tot += ((line.unit_amount / factor) * factor_invoicing)
             elif factor_invoicing <= 1.0:
                 tot += (line.unit_amount / factor)
                 deduced += ((line.unit_amount / factor) * factor_invoicing)
-                
-                
-        return {'total':tot,'deduced':deduced}
-    
+
+        return {'total': tot, 'deduced': deduced}
 
     def _get_and_change_date_format_for_swiss(self, date_to_format):
         date_formatted = ''
         if date_to_format:
-            date_formatted = strptime(date_to_format, '%Y-%m-%d').strftime('%d.%m.%Y')
+            date_formatted = datetime.strptime(date_to_format, '%Y-%m-%d').strftime('%d.%m.%Y')
         return date_formatted
 
 report_sxw.report_sxw('report.hr.analytic.timesheet.report', 'hr.analytic.timesheet', 'addons/hr_timesheet_print/report/timesheet_report.rml', parser=timesheet_report)
 
=== modified file 'hr_timesheet_print/report/timesheet_report.rml'
--- hr_timesheet_print/report/timesheet_report.rml	2011-08-12 12:33:12 +0000
+++ hr_timesheet_print/report/timesheet_report.rml	2012-12-12 10:37:22 +0000
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Timesheet Report" author="" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
-        <pageGraphics>
-               <setFont name="Helvetica-Bold" size="9"/>
-
-               <drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-               <drawString x="17.7cm" y="28.1cm">Maintenance And Support Summary</drawString>
-
-               <setFont name="Helvetica" size="9"/>
-               <drawString x="1.0cm" y="2cm"> [[ time.strftime("%m-%d-%y %H:%M", time.localtime()) ]]</drawString>
-               <drawString x="17.7cm" y="2cm">Page <pageNumber/></drawString>
-
-               <lineMode width="0.7"/>
-               <lines>0.6cm 27.9cm 20.3cm 27.9cm</lines>
-               <setFont name="Helvetica" size="8"/>
-             </pageGraphics>   
+      <pageGraphics>
+        <setFont name="Helvetica-Bold" size="9"/>
+
+        <drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
+        <drawString x="17.7cm" y="28.1cm">Maintenance And Support Summary</drawString>
+
+        <setFont name="Helvetica" size="9"/>
+        <drawString x="1.0cm" y="2cm"> [[ time.strftime("%m-%d-%y %H:%M", time.localtime()) ]]</drawString>
+        <drawString x="17.7cm" y="2cm">Page <pageNumber/></drawString>
+
+        <lineMode width="0.7"/>
+        <lines>0.6cm 27.9cm 20.3cm 27.9cm</lines>
+        <setFont name="Helvetica" size="8"/>
+      </pageGraphics>
 
     </pageTemplate>
   </template>
@@ -26,7 +26,7 @@
       <blockValign value="TOP"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
-        <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,0" stop="-1,-1"/>
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <blockBackground colorName="#e6e6e6" start="0,0" stop="0,-1"/>
@@ -35,7 +35,7 @@
       <blockBackground colorName="#e6e6e6" start="0,1" stop="0,-1"/>
       <blockBackground colorName="#e6e6e6" start="1,1" stop="1,-1"/>
       <blockBackground colorName="#e6e6e6" start="2,1" stop="2,-1"/>
-      
+
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -57,7 +57,7 @@
     <blockTableStyle id="Table2">
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
-      
+
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
@@ -85,7 +85,7 @@
     <blockTableStyle id="Table7">
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
     </blockTableStyle>
-  
+
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -94,7 +94,7 @@
     <paraStyle name="P2c" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
-   <paraStyle name="P9" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/>
     <paraStyle name="P9b" fontName="Helvetica" fontSize="8"  alignment="LEFT"/>
     <paraStyle name="P9c" fontName="Helvetica" fontSize="8"  alignment="RIGHT"/>
     <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -130,64 +130,62 @@
     </blockTableStyle>
 
     <paraStyle
-        name="Level5" 
-        fontName="Helvetica"
-        fontSize="8.0" />
-    <paraStyle
-        name="Level4" 
-        fontName="Helvetica" 
-        fontSize="8.0" />
-    <paraStyle
-        name="Level3" 
-        fontName="Helvetica" 
-        fontSize="8.0" />
-    <paraStyle
-        name="Level2" 
-        firstLineIndent="-0.03cm"
-        fontName="Helvetica-Bold" 
-        fontSize="8.0" />
+      name="Level5" 
+      fontName="Helvetica"
+      fontSize="8.0" />
+    <paraStyle
+      name="Level4" 
+      fontName="Helvetica" 
+      fontSize="8.0" />
+    <paraStyle
+      name="Level3" 
+      fontName="Helvetica" 
+      fontSize="8.0" />
+    <paraStyle
+      name="Level2" 
+      firstLineIndent="-0.03cm"
+      fontName="Helvetica-Bold" 
+      fontSize="8.0" />
     <paraStyle name="Level1"
-        fontSize="8.0"
-        fontName="Helvetica-Bold" 
-        />
+      fontSize="8.0"
+      fontName="Helvetica-Bold" 
+      />
     <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
   </stylesheet>
   <images/>
   <story>
 
-   <para style="P2">[[ objects and objects[0] and setLang(objects[0].account_id.partner_id.lang) ]]</para>
-   <para style="P1">Spent hours details</para>
- 
+    <para style="P2">[[ objects and objects[0] and setLang(objects[0].account_id.partner_id.lang) ]]</para>
+    <para style="P1">Spent hours details</para>
+
     <para style="P12a"></para>
     <para style="P12a"></para>
     <blockTable colWidths="258.0,259.0" style="Table1" repeatRows="1">
-        <tr>
-            <td>
-              <para style="P12a">Report Date : </para>
-            </td>
-            <td>
-              <para style="P2">[[ time.strftime("%d.%m.%Y", time.localtime()) ]]</para>
-            </td>
-        </tr>
-        <tr>
-            <td>
-              <!-- <para style="P12a">[[ o.type == 'hours' and "Quantity of hours" or "Amount"]] used : </para> -->
-              <para style="P12a">Total hours : </para>
-            </td>
-            <td>
-              <para style="P2">[[ round(tot_hours['total'],2) ]]</para>
-            </td>
-        </tr>
-        <tr>
-            <td>
-              <!-- <para style="P12a">[[ o.type == 'hours' and "Quantity of hours" or "Amount"]] used : </para> -->
-              <para style="P12a">Invoiced hours : </para>
-            </td>
-            <td>
-              <para style="P2">[[ round(tot_hours['deduced'],2) or '0.0' ]]</para>
-            </td>
-        </tr>
+      <tr>
+        <td>
+          <para style="P12a">Report Date: </para>
+        </td>
+        <td>
+          <para style="P2">[[ time.strftime("%d.%m.%Y", time.localtime()) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P12a">Total hours: </para>
+        </td>
+        <td>
+          <para style="P2">[[ round(tot_hours['total'],2) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P12a">Invoiced hours: </para>
+        </td>
+        <td>
+          <para style="P2">[[ round(tot_hours['deduced'], 2) or '0.0' ]]</para>
+        </td>
+      </tr>
     </blockTable>
     <para style="P12a"></para>
     <para style="P12a"></para>
@@ -210,25 +208,25 @@
           <para style="P12a">Deduced</para>
         </td>
       </tr>
-      
-       <tr>
-           [[ repeatIn(objects,'l') ]]
-         <td>
-           <para style="P2">[[ l.date and format_date(l.date) or '' ]]</para>
-         </td>
-         <td>
-           <para style="P2">[[ l.name or '' ]]</para>
-         </td>
-         <td>
-           <para style="P2c">[[ round(l.to_invoice.factor &gt;= 0.0 and l.unit_amount or l.to_invoice.factor &lt;= -0.01 and l.unit_amount and ((l.unit_amount and l.to_invoice) and (l.unit_amount - (l.unit_amount * l.to_invoice.factor) / 100 ) or '0.0') or '0.0',2) ]]</para>
-         </td>
-         <td>
-           <para style="P2c">[[ l.to_invoice.factor &gt;= 0.0 and l.to_invoice.customer_name or l.to_invoice.factor &lt;= -0.01 and '100%' ]]</para>
-         </td>
-         <td>
-           <para style="P2c">[[ round((l.unit_amount and l.to_invoice) and (l.unit_amount - (l.unit_amount * l.to_invoice.factor) / 100 ) or '0.0', 2) ]]</para>
-         </td>
-       </tr>
+
+      <tr>
+        [[ repeatIn(objects, 'l') ]]
+        <td>
+          <para style="P2">[[ l.date and format_date(l.date) or '' ]]</para>
+        </td>
+        <td>
+          <para style="P2">[[ l.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="P2c">[[ round(l.to_invoice.factor &gt;= 0.0 and l.unit_amount or l.to_invoice.factor &lt;= -0.01 and l.unit_amount and ((l.unit_amount and l.to_invoice) and (l.unit_amount - (l.unit_amount * l.to_invoice.factor) / 100 ) or 0.0), 2) or '0.0' ]]</para>
+        </td>
+        <td>
+          <para style="P2c">[[ l.to_invoice.factor &gt;= 0.0 and l.to_invoice.customer_name or l.to_invoice.factor &lt;= -0.01 and '100%' ]]</para>
+        </td>
+        <td>
+          <para style="P2c">[[ round((l.unit_amount and l.to_invoice) and (l.unit_amount - (l.unit_amount * l.to_invoice.factor) / 100 ) or 0.0, 2) or '0.0' ]]</para>
+        </td>
+      </tr>
     </blockTable>
 
   </story>