openerp-dev-web team mailing list archive

["apa \(Open ERP\)" <apa@xxxxxxxxxxx>]

apa (Open ERP) has proposed merging lp:~openerp-report/openobject-addons/report-dev-apa into lp:~openerp-dev/openobject-addons/report_dev.

Requested reviews:
  qdp (OpenERP) (qdp)
  apa (Open ERP) (apa-tiny)
Related bugs:
  #645969 [trunk] accounting - GL report (and others) - repeat column headers
  https://bugs.launchpad.net/bugs/645969
  #667710 Account Trail Balance report rml font-size too large and PDF seems ugly
  https://bugs.launchpad.net/bugs/667710
  #680468 not able to make an allocation request
  https://bugs.launchpad.net/bugs/680468


TASK ID : 956
=============
- add field origin in the print invoice report
- rename document title into 'Description"
- when creating an invoice from a SO, do not copy the origin into the description of the invoice (SO0006 if no description)

Bug : lp:680468
=============
-  [FIX] hr_payroll : not able to make an allocation request.
-- 
https://code.launchpad.net/~openerp-report/openobject-addons/report-dev-apa/+merge/42929
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/report_dev.

=== modified file 'account/report/account_general_ledger_landscape.rml'
--- account/report/account_general_ledger_landscape.rml	2010-11-25 14:41:27 +0000
+++ account/report/account_general_ledger_landscape.rml	2010-12-07 11:52:19 +0000
@@ -313,7 +313,7 @@
 	          <para style="terp_tblheader_Details_Right">Currency</para>
 	        </td>
 	      </tr>
-	    </blockTable>  
+	    </blockTable>
   		<blockTable colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
 	      <tr>
 	        <td>

=== modified file 'account/report/account_print_invoice.rml'
--- account/report/account_print_invoice.rml	2010-11-16 05:50:35 +0000
+++ account/report/account_print_invoice.rml	2010-12-07 11:52:19 +0000
@@ -193,7 +193,7 @@
     <blockTable colWidths="177.0,177.0,177.0" style="Table_Invoice_General_Header">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Document</para>
+          <para style="terp_tblheader_General_Centre">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Invoice Date</para>

=== modified file 'account/report/account_print_invoice.sxw'
Binary files account/report/account_print_invoice.sxw	2010-11-01 11:06:11 +0000 and account/report/account_print_invoice.sxw	2010-12-07 11:52:19 +0000 differ
=== modified file 'account_invoice_layout/report/report_account_invoice_layout.rml'
--- account_invoice_layout/report/report_account_invoice_layout.rml	2010-11-16 05:50:35 +0000
+++ account_invoice_layout/report/report_account_invoice_layout.rml	2010-12-07 11:52:19 +0000
@@ -240,7 +240,7 @@
     <blockTable colWidths="180.0,179.0,180.0" style="Table_Invoice_General_Header">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Document</para>
+          <para style="terp_tblheader_General_Centre">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Invoice Date</para>

=== modified file 'account_invoice_layout/report/report_account_invoice_layout.sxw'
Binary files account_invoice_layout/report/report_account_invoice_layout.sxw	2010-11-01 11:06:11 +0000 and account_invoice_layout/report/report_account_invoice_layout.sxw	2010-12-07 11:52:19 +0000 differ
=== modified file 'account_invoice_layout/report/special_message_invoice.rml'
--- account_invoice_layout/report/special_message_invoice.rml	2010-11-16 05:50:35 +0000
+++ account_invoice_layout/report/special_message_invoice.rml	2010-12-07 11:52:19 +0000
@@ -244,7 +244,7 @@
     <blockTable colWidths="180.0,179.0,180.0" style="Table_Invoice_General_Header">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Document</para>
+          <para style="terp_tblheader_General_Centre">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Invoice Date</para>

=== modified file 'account_invoice_layout/report/special_message_invoice.sxw'
Binary files account_invoice_layout/report/special_message_invoice.sxw	2010-11-01 11:06:11 +0000 and account_invoice_layout/report/special_message_invoice.sxw	2010-12-07 11:52:19 +0000 differ
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2010-11-19 12:20:03 +0000
+++ hr_holidays/hr_holidays.py	2010-12-07 11:52:19 +0000
@@ -202,6 +202,9 @@
             vals['type'] = context['type']
         if context.has_key('allocation_type'):
             vals['allocation_type'] = context['allocation_type']
+        #set type because when create allocation request then defaut value of type is 'remove'
+        if not vals.has_key('date_from') and not vals.has_key('date_to'):
+            vals.update({'type':'add'})
         return super(hr_holidays, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):

=== modified file 'sale/sale.py'
--- sale/sale.py	2010-11-11 06:22:25 +0000
+++ sale/sale.py	2010-12-07 11:52:19 +0000
@@ -425,7 +425,7 @@
                     inv_line_id = obj_invoice_line.copy(cr, uid, preline.id, {'invoice_id': False, 'price_unit': -preline.price_unit})
                     lines.append(inv_line_id)
         inv = {
-            'name': order.client_order_ref or order.name,
+            'name': order.origin or order.client_order_ref or order.name,
             'origin': order.name,
             'type': 'out_invoice',
             'reference': "P%dSO%d" % (order.partner_id.id, order.id),