merge

bzr revid: nel@silver-20080926134630-dh0wovt4joaaib98

diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index 6d2be72..e39874f 100644 (file)
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -38,7 +38,7 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_employee_detail_header">
+    <blockTableStyle id="Table_hr_expense_line_header">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -48,43 +48,27 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table_expense_line">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_employee_detail_content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_employee_total">
+    <blockTableStyle id="Table_Final_total">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -112,7 +96,7 @@
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_centre_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -124,10 +108,16 @@
   <images/>
   <story>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <para style="terp_header_Centre">HR Expenses [[ o.name or '' ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="174.0,174.0,174.0" style="Table_employee_ref_header">
       <tr>
         <td>
@@ -157,10 +147,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="63.0,224.0,72.0,58.0,43.0,62.0" style="Table_employee_detail_header">
+    <blockTable colWidths="49.0,204.0,45.0,80.0,53.0,91.0" style="Table_hr_expense_line_header">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -169,79 +156,94 @@
           <para style="terp_tblheader_Details">Name</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
+          <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit price</para>
+          <para style="terp_tblheader_Details">Unit Price</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total</para>
+          <para style="terp_tblheader_Details_Centre">Total</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="523.0" style="Table1">
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.line_ids,'line') ]]</para>
+      <blockTable colWidths="49.0,204.0,46.0,58.0,23.0,52.0,71.0,21.0" style="Table_expense_line">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime(line.date_value, '%Y-%m-%d')) or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line.name or '' ]] [[ line.description or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line.ref or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ '%.2f' % line.unit_amount or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ company.currency_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ '%.2f' % line.unit_quantity or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ '%.2f' % line.total_amount or '' ]] </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ company.currency_id.name ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="57.0,171.0,171.0,32.0,71.0,21.0" style="Table_Final_total">
       <tr>
         <td>
-          <para style="terp_default_8">[[ repeatIn(o.line_ids,'line') ]]</para>
-          <blockTable colWidths="61.0,224.0,72.0,58.0,43.0,34.0,24.0" style="Table_employee_detail_content">
-            <tr>
-              <td>
-                <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime(line.date_value, '%Y-%m-%d')) or '' ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_9">[[ line.name or '' ]] [[ line.description or '' ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Centre_9">[[ line.ref or '' ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ '%.2f' % line.unit_amount or '' ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Centre_9">[[ '%.2f' % line.unit_quantity or '' ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ '%.2f' % line.total_amount or '' ]] </para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ company.currency_id.name ]]</para>
-              </td>
-            </tr>
-          </blockTable>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
         </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="418.0,43.0,39.0,23.0" style="Table_employee_total">
-      <tr>
         <td>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Total:</para>
+          <para style="terp_tblheader_Details_Right">Total:</para>
         </td>
         <td>
-          <para style="terp_default_9_bold_right">[[ '%.2f' % o.amount ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ '%.2f' % o.amount ]]</para>
         </td>
         <td>
-          <para style="terp_default_9_bold_right">[[ company.currency_id.name ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ company.currency_id.name ]]</para>
         </td>
       </tr>
     </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
     <para style="terp_default_9">[[ o.note or '' ]] [[ setTag('para','xpre') ]]</para>
-    <para style="terp_default_8">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
     <para style="terp_default_9">Certified honest and conform,</para>
     <para style="terp_default_9">(Date and signature)</para>
-    <para style="terp_default_8">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
     <para style="terp_default_9">This document must be dated and signed for reimbursment</para>

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 0c3527b..d0f2951 100644 (file)
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -419,6 +419,7 @@ class purchase_order_line(osv.osv):
 
     def product_id_change(self, cr, uid, ids, pricelist, product, qty, uom,
             partner_id, date_order=False):
+        prod= self.pool.get('product.product').browse(cr, uid,product)
         if not pricelist:
             raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist in the purchase form !\nPlease set one before choosing a product.'))
         if not product:

diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml
index 1163957..ca7f5d8 100644 (file)
--- a/addons/sale/report/order.rml
+++ b/addons/sale/report/order.rml
@@ -149,7 +149,7 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_Bold_9">Invoice address :[[ o.partner_id.property_payment_term and o.partner_id.property_payment_term.name or '']]</para>
+          <para style="terp_default_Bold_9">Invoice address :[[ o.partner_id.property_payment_term and o.partner_id.property_payment_term.name or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
           <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
         </td>

diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 99beed9..23c9be5 100644 (file)
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -104,7 +104,7 @@
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_5cm_Above_Space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="14.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_5cm_Above_Space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
   </stylesheet>
   <images/>
   <story>
@@ -187,7 +187,7 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="58.0,268.0,50.0,82.0,56.0" repeatRows="1" style="Move_Line_Header">
+    <blockTable colWidths="58.0,261.0,49.0,89.0,56.0" repeatRows="1" style="Move_Line_Header">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
@@ -208,7 +208,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]]</para>
-      <blockTable colWidths="59.0,268.0,56.0,51.0,25.0,54.0" style="Move_Line_Contect">
+      <blockTable colWidths="59.0,261.0,49.0,64.0,25.0,54.0" style="Move_Line_Contect">
         <tr>
           <td>
             <para style="terp_default_9">[[ move_lines.product_id.default_code ]]</para>

diff --git a/bin/report/printscreen/ps_form.py b/bin/report/printscreen/ps_form.py
index 34e9933..e39949b 100644 (file)
--- a/bin/report/printscreen/ps_form.py
+++ b/bin/report/printscreen/ps_form.py
@@ -141,9 +141,8 @@ class report_printscreen_list(report_int):
                     line[f] = line[f][1]
                 if fields[f]['type'] in ('one2many','many2many') and line[f]:
                     line[f] = '( '+str(len(line[f])) + ' )'
-                if fields[f]['type'] == 'float':
-                    precision=(('digits' in fields[f]) and fields[f]['digits'][1]) or 2
-                    line[f]=round(line[f],precision)
+                if fields[f]['type'] in ('float','integer'):
+                    line[f]=round(line[f],2)
                 col = new_doc.createElement("col")
                 col.setAttribute('tree','no')
                 if line[f] != None:

diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index 0187b68..d024582 100644 (file)
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -153,6 +153,7 @@ class report_printscreen_list(report_int):
             tsum.append(0)
         for line in results:
             node_line = new_doc.createElement("row")
+
             count = -1
             for f in fields_order:
                 count += 1
@@ -160,9 +161,8 @@ class report_printscreen_list(report_int):
                     line[f] = line[f][1]
                 if fields[f]['type'] in ('one2many','many2many') and line[f]:
                     line[f] = '( '+str(len(line[f])) + ' )'
-                if fields[f]['type'] == 'float':
-                    precision=(('digits' in fields[f]) and fields[f]['digits'][1]) or 2
-                    line[f]=round(line[f],precision)
+                if fields[f]['type'] in ('float','integer'):
+                    line[f]=round(line[f],2)
                 col = new_doc.createElement("col")
                 col.setAttribute('para','yes')
                 col.setAttribute('tree','no')