Merge lp:~unifield-team/unifield-wm/UF-2464 into lp:unifield-wm

[jftempo]

Unmerged revisions

2266. By Sean Carroll on 2014-10-02

UF-2464:[FIX] repaired cash inventory report

=== modified file 'register_accounting/report/cash_inventory.rml'
--- register_accounting/report/cash_inventory.rml	2014-09-23 08:09:20 +0000
+++ register_accounting/report/cash_inventory.rml	2014-10-03 07:52:56 +0000
@@ -124,6 +124,7 @@
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
     <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P2c" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
     <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
     <paraStyle name="P2a" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
     <paraStyle name="P3a" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
@@ -243,13 +244,13 @@
           <blockTable style="Table3">
             <tr>
               <td>
-                <para style="P2">Values</para>
-              </td>
-              <td>
-                <para style="P2">Number</para>
-              </td>
-              <td>
-                <para style="P2">Sub-total</para>
+                <para style="P2c">Values</para>
+              </td>
+              <td>
+                <para style="P2c">Number</para>
+              </td>
+              <td>
+                <para style="P2c">Sub-total</para>
               </td>
             </tr>
           </blockTable>
@@ -258,13 +259,13 @@
           <blockTable style="Table3">
             <tr>
               <td>
-                <para style="P2">Values</para>
-              </td>
-              <td>
-                <para style="P2">Number</para>
-              </td>
-              <td>
-                <para style="P2">Sub-total</para>
+                <para style="P2c">Values</para>
+              </td>
+              <td>
+                <para style="P2c">Number</para>
+              </td>
+              <td>
+                <para style="P2c">Sub-total</para>
               </td>
             </tr>
           </blockTable>

=== modified file 'register_accounting/report/fully_report_xls.mako'
--- register_accounting/report/fully_report_xls.mako	2014-09-11 08:05:28 +0000
+++ register_accounting/report/fully_report_xls.mako	2014-10-03 07:52:56 +0000
@@ -570,7 +570,7 @@
           <Data ss:Type="String">${inv_line.name or ''|x}</Data>
         </Cell>
         <Cell ss:StyleID="left">
-          <Data ss:Type="String">${inv_line.reference or ''|x}</Data>
+          <Data ss:Type="String">${hasattr(inv_line, 'reference') and inv_line.reference or ''|x}</Data>
         </Cell>
         <Cell ss:StyleID="left">
           <Data ss:Type="String">${inv_line.account_id and inv_line.account_id.code + ' ' + inv_line.account_id.name or ''|x}</Data>