[MERGE] merge with main branch

bzr revid: qdp-launchpad@tinyerp.com-20100629131407-hua389dr8j26xwol

addons/account/report/wizard_central_journal.rml

@@ -146,9 +146,6 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-   
-  
-	<section> 		
     <blockTable colWidths="180.0,180.0,180.0" style="Table_Sub_Header_Content">
 	<para style="terp_default_8">[[ repeatIn(lines(data['form']['periods'],data['form']['journal_ids']), 'line') ]]</para>      
   	<condPageBreak height="1"/>
@@ -244,9 +241,6 @@
       </td>
       </tr>
    	 </blockTable>
-   	 <pageBreak/>
-   	 </section>
-   	  	
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>

addons/account/wizard/account_central_journal_view.xml

@@ -22,7 +22,7 @@
 			    	<separator/><newline/>
 			    	<group>
  	            	<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
- 	            	<button name="check_report" string="Print" type="object" icon="gtk-ok"/>
+ 	            	<button name="check_report" string="Print" type="object" icon="gtk-print"/>
 					</group>
 				</group>			    		
 			</form>