clearcorp team mailing list archive

Thread
Date

[Merge] lp:~dr.clearcorp/openerp-ccorp-addons/6.1-hr_payroll into lp:openerp-ccorp-addons

To: mp+134159@xxxxxxxxxxxxxxxxxx
From: Diana Rodríguez Martínez <diana.rodriguez@xxxxxxxxxxxxxxx>
Date: Tue, 13 Nov 2012 17:26:21 -0000
Reply-to: mp+134159@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-ccorp-addons/6.1-hr_payroll into lp:openerp-ccorp-addons.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-hr_payroll/+merge/134159

[FIX] Fix style for Payslip and payslip detail report.
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-hr_payroll/+merge/134159
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.

=== modified file 'hr_payroll_report/report/hr_payroll_details_report.mako'
--- hr_payroll_report/report/hr_payroll_details_report.mako	2012-11-07 17:21:58 +0000
+++ hr_payroll_report/report/hr_payroll_details_report.mako	2012-11-13 17:25:25 +0000
@@ -37,90 +37,92 @@
     </head>
     <body class = "data">
         %for payslip in objects :
-        <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${company.partner_id.name | entity} - ${company.currency_id.name | entity}</div>
-        <div style="font-size: 25px; font-weight: bold; text-align: center;"> Comprobante de Pago de Salario</div>
-        <%setLang(user.context_lang)%>        
-        <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${payslip.name or payslip.employee_id.name}</div>
-        <br></br>        
-        <div class="act_as_table data_table" style="width: 500px;">
-            <div class="act_as_thead">
-                <div class="act_as_row lines">
-                    <div class="act_as_cell" style="text-align:left;"><b>${_('Name')}</b></div>
-                    <div class="act_as_cell" style="text-align:left;">${payslip.employee_id.name or '-'}</div>
-               </div>
-               <div class="act_as_row lines">
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('ID card')}</b></div>
-                    <div class="act_as_cell"style="text-align:left;">${payslip.employee_id.ssnid or '-'}</div>  
-               </div>    
-               <div class="act_as_row lines">
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('Bank account')}</b></div>
-                    <div class="act_as_cell"style="text-align:left;">${payslip.employee_id.bank_account_id.name or '-'}</div> 
-               </div>     
-               <div class="act_as_row lines">
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('Job')}</b></div>
-                    <div class="act_as_cell"style="text-align:left;">${payslip.contract_id.job_id.name or '-'}</div>
-               </div>                       
-               <div class="act_as_row lines">  
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('Reference')}</b></div>
-                    <div class="act_as_cell"style="text-align:left;">${payslip.number or '-'}</div>
-               </div>   
-               <div class="act_as_row lines">   
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('Date from')}</b></div>  
-                    <div class="act_as_cell"style="text-align:left;">${payslip.date_from or '-'}</div>
-               </div>    
-               <div class="act_as_row lines">
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('Date to')}</b></div>
-                    <div class="act_as_cell"style="text-align:left;">${payslip.date_to or '-'}</div>
-               </div>     
-               <div class="act_as_row lines">    
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('Salary structure')}</b></div>
-                    <div class="act_as_cell"style="text-align:left;">${payslip.struct_id.name or '-'}</div>
-                </div>
-            </div>   
-        </div>        
-        <br></br><br></br>
-        ##Worked days
-        <% worked_lines_ids = get_worked_lines(cr,uid,payslip.id,payslip.contract_id.schedule_pay) %>
-        <div style="font-size: 16px; font-weight: bold; text-align: left;"> ${_('Quantity of hours')} </div>
-        <div class="act_as_table list_table">
-            <div class="act_as_thead">
-                <div class="act_as_row labels" style="font-weight: bold; font-size: 11x;">
-                    <div class="act_as_cell first_column" style="vertical-align: middle">${_('Name')}</div>
-                    <div class="act_as_cell amount">${_('Code')}</div>
-                    <div class="act_as_cell amount">${_('Number of days')}</div>
-                    <div class="act_as_cell amount">${_('Number of hours')}</div>
-                </div>
-            </div>
-            <div class="act_as_tbody">  
-                <% flag_HE = not_HE(cr,uid,worked_lines_ids) %>
-                <% flag_HN = not_HN(cr,uid,worked_lines_ids) %>
-                
-                %for line in worked_lines_ids:
-                <div class="act_as_row lines">
-                    <div class="act_as_cell">${line.name or '-'}</div>
-                    <div class="act_as_cell amount">${line.code or '-'}</div>                    
-                    <div class="act_as_cell amount">${formatLang(line.number_of_days) or '-'}</div>
-                    <div class="act_as_cell amount">${formatLang(line.number_of_hours) or '-'}</div>
-                </div>
-                %endfor
-                %if flag_HE is False:
-                    <div class="act_as_row lines">
-                        <div class="act_as_cell">${_('DONT EXIST EXTRA HOURS REGISTRED')}</div>
-                        <div class="act_as_cell amount">${'HE'}</div>                    
-                        <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
-                        <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
-                    </div>
-                %endif
-                %if flag_HN is False:
-                    <div class="act_as_row lines">
-                        <div class="act_as_cell">${_('DONT EXIST NORMAL HOURS REGISTRED')}</div>
-                        <div class="act_as_cell amount">${'HN'}</div>                    
-                        <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
-                        <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
-                    </div>
-                %endif
-            </div> 
             <br></br><br></br>
+            <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${company.partner_id.name | entity} - ${company.currency_id.name | entity}</div>
+            <div style="font-size: 25px; font-weight: bold; text-align: center;"> Comprobante de Pago de Salario</div>
+            <%setLang(user.context_lang)%>        
+            <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${payslip.name or payslip.employee_id.name}</div>
+            <br></br>        
+            <div class="act_as_table data_table" style="width: 500px;">
+                <div class="act_as_thead">
+                    <div class="act_as_row lines">
+                        <div class="act_as_cell" style="text-align:left;"><b>${_('Name')}</b></div>
+                        <div class="act_as_cell" style="text-align:left;">${payslip.employee_id.name or '-'}</div>
+                   </div>
+                   <div class="act_as_row lines">
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('ID card')}</b></div>
+                        <div class="act_as_cell"style="text-align:left;">${payslip.employee_id.ssnid or '-'}</div>  
+                   </div>    
+                   <div class="act_as_row lines">
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('Bank account')}</b></div>
+                        <div class="act_as_cell"style="text-align:left;">${payslip.employee_id.bank_account_id.name or '-'}</div> 
+                   </div>     
+                   <div class="act_as_row lines">
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('Job')}</b></div>
+                        <div class="act_as_cell"style="text-align:left;">${payslip.contract_id.job_id.name or '-'}</div>
+                   </div>                       
+                   <div class="act_as_row lines">  
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('Reference')}</b></div>
+                        <div class="act_as_cell"style="text-align:left;">${payslip.number or '-'}</div>
+                   </div>   
+                   <div class="act_as_row lines">   
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('Date from')}</b></div>  
+                        <div class="act_as_cell"style="text-align:left;">${payslip.date_from or '-'}</div>
+                   </div>    
+                   <div class="act_as_row lines">
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('Date to')}</b></div>
+                        <div class="act_as_cell"style="text-align:left;">${payslip.date_to or '-'}</div>
+                   </div>     
+                   <div class="act_as_row lines">    
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('Salary structure')}</b></div>
+                        <div class="act_as_cell"style="text-align:left;">${payslip.struct_id.name or '-'}</div>
+                    </div>
+                </div>   
+            </div>        
+            <br></br>
+            ##Worked days
+            <% worked_lines_ids = get_worked_lines(cr,uid,payslip.id,payslip.contract_id.schedule_pay) %>
+            <div style="font-size: 16px; font-weight: bold; text-align: left;"> ${_('Quantity of hours')} </div>
+            <div class="act_as_table list_table">
+                <div class="act_as_thead">
+                    <div class="act_as_row labels" style="font-weight: bold; font-size: 11x;">
+                        <div class="act_as_cell first_column" style="vertical-align: middle">${_('Name')}</div>
+                        <div class="act_as_cell amount">${_('Code')}</div>
+                        <div class="act_as_cell amount">${_('Number of days')}</div>
+                        <div class="act_as_cell amount">${_('Number of hours')}</div>
+                    </div>
+                </div>
+                <div class="act_as_tbody">  
+                    <% flag_HE = not_HE(cr,uid,worked_lines_ids) %>
+                    <% flag_HN = not_HN(cr,uid,worked_lines_ids) %>
+                    
+                    %for line in worked_lines_ids:
+                    <div class="act_as_row lines">
+                        <div class="act_as_cell">${line.name or '-'}</div>
+                        <div class="act_as_cell amount">${line.code or '-'}</div>                    
+                        <div class="act_as_cell amount">${formatLang(line.number_of_days) or '-'}</div>
+                        <div class="act_as_cell amount">${formatLang(line.number_of_hours) or '-'}</div>
+                    </div>
+                    %endfor
+                    %if flag_HE is False:
+                        <div class="act_as_row lines">
+                            <div class="act_as_cell">${_('DONT EXIST EXTRA HOURS REGISTRED')}</div>
+                            <div class="act_as_cell amount">${'HE'}</div>                    
+                            <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
+                            <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
+                        </div>
+                    %endif
+                    %if flag_HN is False:
+                        <div class="act_as_row lines">
+                            <div class="act_as_cell">${_('DONT EXIST NORMAL HOURS REGISTRED')}</div>
+                            <div class="act_as_cell amount">${'HN'}</div>                    
+                            <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
+                            <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
+                        </div>
+                    %endif
+                </div> 
+            </div>
+            <br></br>
             ##Salary Computation
             <div style="font-size: 16px; font-weight: bold; text-align: left;">${_('Salary Computation')} </div>
             <div class="act_as_table list_table">
@@ -148,8 +150,29 @@
                     %endfor
                 </div>  
             </div>    
-        %endfor        
-    </div>   
-    <p style="page-break-after:always"></p>        
+            <br></br> <br></br>
+            <div class="act_as_table data_table" style="margin-top:30px">
+                <div class="act_as_tbody">            
+                    <div class="act_as_row" style="vertical-align: bottom">
+                       <div style="padding-bottom:5px">___________________________________________________________</div>
+                    </div>
+                    <div class="act_as_row" style="vertical-align: bottom">
+                        <div style="padding-bottom:5px"> ${_('Received and accepted: ')}${payslip.employee_id.name}</div>
+                    </div>
+                    <div class="act_as_row" style="vertical-align: bottom">
+                        <div style="padding-bottom:5px">${_('ID card: ')}${payslip.employee_id.ssnid}</div>
+                    </div>
+                    <br></br> <br></br><br></br>
+                    <div class="act_as_row" style="text-align:justify;text-justify:inter-word;">
+                        <div style="padding-bottom:5px">${company.payslip_footer or ''}</div>
+                    </div>
+                </div>
+            </div>
+            <p style="page-break-after:always"></p>
+        %endfor   
     </body>
 </html>
+
+
+
+            

=== modified file 'hr_payroll_report/report/hr_payroll_report.mako'
--- hr_payroll_report/report/hr_payroll_report.mako	2012-11-07 17:21:58 +0000
+++ hr_payroll_report/report/hr_payroll_report.mako	2012-11-13 17:25:25 +0000
@@ -37,89 +37,91 @@
     </head>
     <body class = "data">
         %for payslip in objects :
-        <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${company.partner_id.name | entity} - ${company.currency_id.name | entity}</div>
-        <div style="font-size: 25px; font-weight: bold; text-align: center;"> Comprobante de Pago de Salario</div>
-        <%setLang(user.context_lang)%>        
-        <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${payslip.name or payslip.employee_id.name}</div>
-        <br></br>        
-        <div class="act_as_table data_table" style="width: 500px;">
-            <div class="act_as_thead">
-                <div class="act_as_row lines">
-                    <div class="act_as_cell" style="text-align:left;"><b>${_('Name')}</b></div>
-                    <div class="act_as_cell" style="text-align:left;">${payslip.employee_id.name or '-'}</div>
-               </div>
-               <div class="act_as_row lines">
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('ID card')}</b></div>
-                    <div class="act_as_cell"style="text-align:left;">${payslip.employee_id.ssnid or '-'}</div>  
-               </div>    
-               <div class="act_as_row lines">
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('Bank account')}</b></div>
-                    <div class="act_as_cell"style="text-align:left;">${payslip.employee_id.bank_account_id.name or '-'}</div> 
-               </div>     
-               <div class="act_as_row lines">
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('Job')}</b></div>
-                    <div class="act_as_cell"style="text-align:left;">${payslip.contract_id.job_id.name or '-'}</div>
-               </div>                       
-               <div class="act_as_row lines">  
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('Reference')}</b></div>
-                    <div class="act_as_cell"style="text-align:left;">${payslip.number or '-'}</div>
-               </div>   
-               <div class="act_as_row lines">   
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('Date from')}</b></div>  
-                    <div class="act_as_cell"style="text-align:left;">${payslip.date_from or '-'}</div>
-               </div>    
-               <div class="act_as_row lines">
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('Date to')}</b></div>
-                    <div class="act_as_cell"style="text-align:left;">${payslip.date_to or '-'}</div>
-               </div>     
-               <div class="act_as_row lines">    
-                    <div class="act_as_cell"style="text-align:left;"><b>${_('Salary structure')}</b></div>
-                    <div class="act_as_cell"style="text-align:left;">${payslip.struct_id.name or '-'}</div>
-                </div>
-            </div>   
-        </div>        
-        <br></br><br></br>
-        ##Worked days
-        <% worked_lines_ids = get_worked_lines(cr,uid,payslip.id,payslip.contract_id.schedule_pay) %>
-        <div style="font-size: 16px; font-weight: bold; text-align: left;"> ${_('Quantity of hours')} </div>
-        <div class="act_as_table list_table">
-            <div class="act_as_thead">
-                <div class="act_as_row labels" style="font-weight: bold; font-size: 11x;">
-                    <div class="act_as_cell first_column" style="vertical-align: middle">${_('Name')}</div>
-                    <div class="act_as_cell amount">${_('Code')}</div>
-                    <div class="act_as_cell amount">${_('Number of days')}</div>
-                    <div class="act_as_cell amount">${_('Number of hours')}</div>
-                </div>
+            <br></br><br></br>
+            <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${company.partner_id.name | entity} - ${company.currency_id.name | entity}</div>
+            <div style="font-size: 25px; font-weight: bold; text-align: center;"> Comprobante de Pago de Salario</div>
+            <%setLang(user.context_lang)%>        
+            <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${payslip.name or payslip.employee_id.name}</div>
+            <br></br>        
+            <div class="act_as_table data_table" style="width: 500px;">
+                <div class="act_as_thead">
+                    <div class="act_as_row lines">
+                        <div class="act_as_cell" style="text-align:left;"><b>${_('Name')}</b></div>
+                        <div class="act_as_cell" style="text-align:left;">${payslip.employee_id.name or '-'}</div>
+                   </div>
+                   <div class="act_as_row lines">
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('ID card')}</b></div>
+                        <div class="act_as_cell"style="text-align:left;">${payslip.employee_id.ssnid or '-'}</div>  
+                   </div>    
+                   <div class="act_as_row lines">
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('Bank account')}</b></div>
+                        <div class="act_as_cell"style="text-align:left;">${payslip.employee_id.bank_account_id.name or '-'}</div> 
+                   </div>     
+                   <div class="act_as_row lines">
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('Job')}</b></div>
+                        <div class="act_as_cell"style="text-align:left;">${payslip.contract_id.job_id.name or '-'}</div>
+                   </div>                       
+                   <div class="act_as_row lines">  
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('Reference')}</b></div>
+                        <div class="act_as_cell"style="text-align:left;">${payslip.number or '-'}</div>
+                   </div>   
+                   <div class="act_as_row lines">   
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('Date from')}</b></div>  
+                        <div class="act_as_cell"style="text-align:left;">${payslip.date_from or '-'}</div>
+                   </div>    
+                   <div class="act_as_row lines">
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('Date to')}</b></div>
+                        <div class="act_as_cell"style="text-align:left;">${payslip.date_to or '-'}</div>
+                   </div>     
+                   <div class="act_as_row lines">    
+                        <div class="act_as_cell"style="text-align:left;"><b>${_('Salary structure')}</b></div>
+                        <div class="act_as_cell"style="text-align:left;">${payslip.struct_id.name or '-'}</div>
+                    </div>
+                </div>   
+            </div>        
+            <br></br><br></br>
+            ##Worked days
+            <% worked_lines_ids = get_worked_lines(cr,uid,payslip.id,payslip.contract_id.schedule_pay) %>
+            <div style="font-size: 16px; font-weight: bold; text-align: left;"> ${_('Quantity of hours')} </div>
+            <div class="act_as_table list_table">
+                <div class="act_as_thead">
+                    <div class="act_as_row labels" style="font-weight: bold; font-size: 11x;">
+                        <div class="act_as_cell first_column" style="vertical-align: middle">${_('Name')}</div>
+                        <div class="act_as_cell amount">${_('Code')}</div>
+                        <div class="act_as_cell amount">${_('Number of days')}</div>
+                        <div class="act_as_cell amount">${_('Number of hours')}</div>
+                    </div>
+                </div>
+                <div class="act_as_tbody">  
+                    <% flag_HE = not_HE(cr,uid,worked_lines_ids) %>
+                    <% flag_HN = not_HN(cr,uid,worked_lines_ids) %>
+                    
+                    %for line in worked_lines_ids:
+                    <div class="act_as_row lines">
+                        <div class="act_as_cell">${line.name or '-'}</div>
+                        <div class="act_as_cell amount">${line.code or '-'}</div>                    
+                        <div class="act_as_cell amount">${formatLang(line.number_of_days) or '-'}</div>
+                        <div class="act_as_cell amount">${formatLang(line.number_of_hours) or '-'}</div>
+                    </div>
+                    %endfor
+                    %if flag_HE is False:
+                        <div class="act_as_row lines">
+                            <div class="act_as_cell">${_('DONT EXIST EXTRA HOURS REGISTRED')}</div>
+                            <div class="act_as_cell amount">${'HE'}</div>                    
+                            <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
+                            <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
+                        </div>
+                    %endif
+                    %if flag_HN is False:
+                        <div class="act_as_row lines">
+                            <div class="act_as_cell">${_('DONT EXIST NORMAL HOURS REGISTRED')}</div>
+                            <div class="act_as_cell amount">${'HN'}</div>                    
+                            <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
+                            <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
+                        </div>
+                    %endif
+                </div> 
             </div>
-            <div class="act_as_tbody">  
-                <% flag_HE = not_HE(cr,uid,worked_lines_ids) %>
-                <% flag_HN = not_HN(cr,uid,worked_lines_ids) %>
-                
-                %for line in worked_lines_ids:
-                <div class="act_as_row lines">
-                    <div class="act_as_cell">${line.name or '-'}</div>
-                    <div class="act_as_cell amount">${line.code or '-'}</div>                    
-                    <div class="act_as_cell amount">${formatLang(line.number_of_days) or '-'}</div>
-                    <div class="act_as_cell amount">${formatLang(line.number_of_hours) or '-'}</div>
-                </div>
-                %endfor
-                %if flag_HE is False:
-                    <div class="act_as_row lines">
-                        <div class="act_as_cell">${_('DONT EXIST EXTRA HOURS REGISTRED')}</div>
-                        <div class="act_as_cell amount">${'HE'}</div>                    
-                        <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
-                        <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
-                    </div>
-                %endif
-                %if flag_HN is False:
-                    <div class="act_as_row lines">
-                        <div class="act_as_cell">${_('DONT EXIST NORMAL HOURS REGISTRED')}</div>
-                        <div class="act_as_cell amount">${'HN'}</div>                    
-                        <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
-                        <div class="act_as_cell amount">${formatLang(0) or '-'}</div>
-                    </div>
-                %endif
-            </div> 
             <br></br><br></br>
             ##Salary Computation
             <div style="font-size: 16px; font-weight: bold; text-align: left;">${_('Salary Computation')} </div>
@@ -148,26 +150,29 @@
                     %endfor
                 </div>  
             </div>    
-        <br></br> <br></br> <br></br> <br></br> <br></br><br></br><br></br>
-        <div class="act_as_table data_table" style="margin-top:30px">
-            <div class="act_as_tbody">            
-                <div class="act_as_row" style="vertical-align: bottom">
-                   <div style="padding-bottom:5px">___________________________________________________________</div>
-                </div>
-                <div class="act_as_row" style="vertical-align: bottom">
-                    <div style="padding-bottom:5px"> ${_('Received and accepted: ')}${payslip.employee_id.name}</div>
-                </div>
-                <div class="act_as_row" style="vertical-align: bottom">
-                    <div style="padding-bottom:5px">${_('ID card: ')}${payslip.employee_id.ssnid}</div>
-                </div>
-                <br></br> <br></br><br></br><br></br>
-                 <div class="act_as_row" style="text-align:justify;text-justify:inter-word;">
-                    <div style="padding-bottom:5px">${company.payslip_footer or ''}</div>
+            <br></br> <br></br> <br></br>
+            <div class="act_as_table data_table" style="margin-top:30px">
+                <div class="act_as_tbody">            
+                    <div class="act_as_row" style="vertical-align: bottom">
+                       <div style="padding-bottom:5px">___________________________________________________________</div>
+                    </div>
+                    <div class="act_as_row" style="vertical-align: bottom">
+                        <div style="padding-bottom:5px"> ${_('Received and accepted: ')}${payslip.employee_id.name}</div>
+                    </div>
+                    <div class="act_as_row" style="vertical-align: bottom">
+                        <div style="padding-bottom:5px">${_('ID card: ')}${payslip.employee_id.ssnid}</div>
+                    </div>
+                    <br></br> <br></br><br></br><br></br>
+                    <div class="act_as_row" style="text-align:justify;text-justify:inter-word;">
+                        <div style="padding-bottom:5px">${company.payslip_footer or ''}</div>
+                    </div>
                 </div>
             </div>
-        </div>
-        %endfor        
-    </div>   
-    <p style="page-break-after:always"></p>        
+            <p style="page-break-after:always"></p>
+        %endfor   
     </body>
 </html>
+
+
+
+

Follow ups

[Merge] lp:~dr.clearcorp/openerp-ccorp-addons/6.1-hr_payroll into lp:openerp-ccorp-addons
From: noreply, 2012-11-13