diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index cfabf9d545f..8178d8fa399 100755
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -42,7 +42,7 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="0" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P3a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="14" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
     <paraStyle name="P9" fontName="Helvetica-Bold" alignment="CENTER" fontSize="12" leftIndent="-5.0"/>
@@ -50,7 +50,7 @@
     <paraStyle name="P9a" fontName="Helvetica-Bold" fontSize="9" leftIndent="0.0" alignment="LEFT"/>
     <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P12a" fontName="Helvetica" fontSize="9.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="5" spaceBefore="0.0" spaceAfter="6.0"/>
     
     <blockTableStyle id="TrLevel8">
       <blockLeftPadding length="0" start="0,0" stop="-1,0"/>
@@ -80,6 +80,31 @@
       <blockLeftPadding length="0" start="0,0" stop="1,0"/>
     </blockTableStyle>
     
+    <blockTableStyle id="TrLevel_Name8">
+      <blockLeftPadding length="100" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="TrLevel_Name7">
+      <blockLeftPadding length="80" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="TrLevel_Name6">
+      <blockLeftPadding length="60" start="1,0" stop="1,0"/>
+     </blockTableStyle>
+    <blockTableStyle id="TrLevel_Name5">
+      <blockLeftPadding length="40" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="TrLevel_Name4">
+     <blockLeftPadding length="20" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="TrLevel_Name3">
+      <blockLeftPadding length="0" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="TrLevel_Name2">
+      <blockLeftPadding length="0" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+ 	<blockTableStyle id="TrLevel_Name1">
+      <blockLeftPadding length="0" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    
     <paraStyle
 		name="Level8" 
 		fontName="Helvetica-Bold" 
@@ -266,7 +291,7 @@
 				      </tr>
 				      <tr>
 						<td><para style="P14">[[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['jname'] or removeParentNode('tr') ]]</para></td>
-				       	<td><para style="P14"><font color="white">[[  a['level']&lt;4 and removeParentNode('font') or '...'*(2) ]]</font>[[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]]<font>[ref: [[ a['ref'] or removeParentNode('font') ]] ]</font> [[ a['lname'] ]]</para></td>
+				       	<td><para style="P14">[[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]] [[ setTag('tr','tr',{'style':('TrLevel_Name'+str(a['level']))}) ]]<font>[ref: [[ a['ref'] or removeParentNode('font') ]] ]</font> [[ a['lname'] ]]</para></td>
 				        <td><para style="P3">[[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '0.00']]</para></td>
 				        <td><para style="P3">[[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '0.00']]</para></td>
 				        <td><para style="P3">[[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '0.00' ]]</para></td>	        
@@ -277,4 +302,3 @@
 </blockTable>
  </story>
 </document>
-
diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index e42d0368d70..20817dff3f3 100755
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -23,7 +23,7 @@
 				<drawString x="1.0cm" y="1cm"> [[ time.strftime("%d-%m-%Y %H:%M", time.localtime()) ]]</drawString>
 				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
 				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-				
+
 
 			    <lineMode width="0.7"/>
 				<lines>1cm 27.7cm 20cm 27.7cm</lines>
@@ -32,29 +32,29 @@
     </pageTemplate>
   </template>
    <stylesheet>
-   
+
     <blockTableStyle id="tbl_header">
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-     
+
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
-    
+
     <blockTableStyle id="tbl_content">
-      
+
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
-    
-   
+
+
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,0"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    
-    
+
+
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -91,7 +91,7 @@
     <paraStyle name="Index" fontName="Helvetica"/>
   </stylesheet>
   <story>
-  	 <blockTable colWidths="54.0,155.0,70.0,20.0,80.0,59.0,52.0,54.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+  	 <blockTable colWidths="54.0,135.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3_centre">Date</para>
@@ -122,7 +122,7 @@
          	<para>[[ repeatIn(objects, 'a') ]]</para>
      			<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
         	<td>
-        			<blockTable colWidths="48.0,155.0,70.0,20.0,80.0,59.0,52.0,54.0" style="tbl_content">
+        			<blockTable colWidths="48.0,135.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_content">
       		<tr>
 	        	<td>
 	        		<blockTable colWidths="273.00,100.0,52.5,52.5,52.5" style="Table5">
@@ -139,7 +139,7 @@
 			            <para style="P9b"><u>[[sum_solde_account(o, data['form']) or '0.0' ]]</u></para>
 			          </td>
 			        </tr>
-	      			</blockTable>   
+	      			</blockTable>
 	        	</td>
         	</tr>
       		<tr>
@@ -147,7 +147,7 @@
 	          <td>
 	            <para style="P16"></para>
 	          </td>
-	 
+
 	          <td>
 	            <para style="P3">Balance Initial</para>
 	          </td>
@@ -169,13 +169,13 @@
 	          <td>
 	            <para style="P4">[[ (o.init_debit - o.init_credit) or '0.0' ]]</para>
 	          </td>
-	   
+
 	        </tr>
 	         <tr>[[ repeatIn(lines(o, data['form']), 'line') ]]
           <td>
             <para style="P3">[[ line['date']  ]]</para>
           </td>
- 
+
           <td>
             <para style="P3">[[ line['partner'] ]]</para>
           </td>
@@ -197,14 +197,14 @@
           <td>
             <para style="P4">[[ line['progress'] and line['progress'] or '0.0' ]]</para>
           </td>
-   
+
         </tr>
       	</blockTable>
         	</td>
         </tr>
      </blockTable>
-     
-      <blockTable colWidths="59.0,125.0,66.0,20.0,100.0,50.0,50.0,50.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+
+      <blockTable colWidths="59.0,105.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3_centre">Date</para>
@@ -229,17 +229,17 @@
           </td>
           <td>
             <para style="P4">Balance</para>
-          </td>          
+          </td>
           <td>
             <para style="P4">Currency</para>
-          </td>          
-  
+          </td>
+
         </tr>
         <tr>
         <para>[[ repeatIn(objects, 'a') ]]</para>
      			<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
         	<td>
-        		<blockTable colWidths="54.0,125.0,66.0,20.0,100.0,50.0,50.0,50.0,40.0" style="tbl_content" >
+        		<blockTable colWidths="54.0,105.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_content" >
       		<tr>
 	        	<td>
 	        		<blockTable colWidths="259.00,100.0,50.0,50.0,49.0,40.00" style="Table5">
@@ -256,18 +256,18 @@
 			            <para style="P9b"><u>[[sum_solde_account(o, data['form']) or '0.0' ]]</u></para>
 			          </td>
 			          <td>
-			          	
+
 			            <para style="P9b"><u> [[ sum_currency_amount_account(a, data['form']) or '0.0' ]]</u></para>
 			          </td>
 			        </tr>
-	      			</blockTable>   
+	      			</blockTable>
 	        	</td>
         	</tr>
       		<tr>[[ data['form']['soldeinit'] == True or removeParentNode('tr') ]]
 	          <td>
 	            <para style="P16"></para>
 	          </td>
-	 
+
 	          <td>
 	            <para style="P3">Balance Initial</para>
 	          </td>
@@ -292,7 +292,7 @@
 	          <td>
 	            <para style="P4"> </para>
 	          </td>
-   
+
         </tr>
         <tr>[[ repeatIn(lines(o, data['form']), 'line') ]]
           <td>
@@ -323,15 +323,15 @@
             <para style="P4">[[ line['amount_currency'] or  '0.0' ]] [[ line['currency_code'] ]]</para>
           </td>
 
-  
+
         </tr>
-      	</blockTable>  
+      	</blockTable>
         	</td>
         </tr>
        </blockTable>
-  
+
   </story>
-  
-    
-    
-</document>
+
+
+
+</document>
\ No newline at end of file
diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index a2f17d7a640..16ddfa9a594 100755
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -24,39 +24,39 @@
 				<drawString x="37.20cm" y="0.90cm">Page <pageNumber/></drawString>
 
 				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-				
+
 
 			    <lineMode width="0.7"/>
 				<lines>1.3cm 24.9cm 38.3cm 24.9cm</lines>
 				<setFont name="Helvetica" size="8"/>
 			    </pageGraphics>
-           
+
     </pageTemplate>
   </template>
    <stylesheet>
-   
+
     <blockTableStyle id="tbl_header">
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-     
+
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
-    
+
     <blockTableStyle id="tbl_content">
-      
+
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
-    
-   
+
+
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,0"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    
-    
+
+
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -92,10 +92,10 @@
     <paraStyle name="Index" fontName="Helvetica"/>
   </stylesheet>
   <story>
-    
-    
-  	 <blockTable colWidths="55.0,35.0,180.0, 90.0,30.0,345.0,50.0,69.0,72.0,64.0,58.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
-  	 
+
+
+  	 <blockTable colWidths="55.0,35.0,150.0, 90.0,60.0,345.0,50.0,69.0,72.0,64.0,58.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+
         <tr>
           <td>
           	<para style="P12"><font color="white"> </font></para>
@@ -145,10 +145,10 @@
         <tr>
         		<para>[[ repeatIn(objects, 'a') ]]</para>
      			<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-     			
+
         	<td>
-        	
-        		<blockTable colWidths="50.0,35.0,180.0, 90.0,30.0,345.0,50.0,69.0,72.0,64.0,58.0" style="tbl_content" >
+
+        		<blockTable colWidths="50.0,35.0,150.0, 90.0,60.0,345.0,50.0,69.0,72.0,64.0,58.0" style="tbl_content" >
       		<tr>
 	        	<td>
 	        		<blockTable colWidths="400.0,374.0,69.0,72.0,64.0,59.00" style="Table5">
@@ -165,18 +165,18 @@
 			            <para style="P9b"><u>[[ sum_solde_account(o, data['form']) or '0.0' ]]</u></para>
 			          </td>
 			          <td>
-			          	
+
 			            <para style="P9b"><u> [[ sum_currency_amount_account(o, data['form']) or '0.0' ]]</u></para>
 			          </td>
 			        </tr>
-	      			</blockTable>   
+	      			</blockTable>
 	        	</td>
         	</tr>
       		<tr>[[ data['form']['soldeinit'] == True or removeParentNode('tr') ]]
           <td>
             <para style="P3_content">Balance Initial</para>
           </td>
- 
+
           <td>
             <para style="P3_content"></para>
           </td>
@@ -207,13 +207,13 @@
           <td>
             <para style="P4_content"> </para>
           </td>
-   
-        </tr>	 
-        
+
+        </tr>
+
         <tr>
         	[[ repeatIn(lines(o, data['form']), 'line') ]]
           <td>
-            
+
             <para style="P2_content">[[ line['date'] ]]</para>
           </td>
           <td>
@@ -247,17 +247,17 @@
             <para style="P4_content">[[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]]</para>
           </td>
         </tr>
-        
-      	</blockTable> 
+
+      	</blockTable>
         </td>
         </tr>
-            
-      
-        
+
+
+
      </blockTable>
-     
-     
-      <blockTable colWidths="55.0,35.0,196.0,90.0,30.0,390.0,50.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+
+
+      <blockTable colWidths="55.0,35.0,166.0,90.0,60.0,390.0,50.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
           <para style="P12">
@@ -320,7 +320,7 @@
             <para style="P4">Balance</para>
           </td>
         </tr>
-        
+
         <tr>
         	<td>
         		<para>[[ repeatIn(objects, 'a') ]]</para>
@@ -342,14 +342,14 @@
 			            <para style="P9b"><u>[[sum_solde_account(o, data['form']) or '0.0' ]]</u></para>
 			          </td>
 			        </tr>
-	      			</blockTable>   
+	      			</blockTable>
 	        	</td>
         	</tr>
       		 <tr>[[ data['form']['soldeinit'] == True or removeParentNode('tr') ]]
           <td>
             <para style="P3_content"></para>
           </td>
- 
+
           <td>
             <para style="P3_content">Solde Initial</para>
           </td>
@@ -368,7 +368,7 @@
         <td>
             <para style="P3_content"></para>
           </td>
- 	  
+
           <td>
             <para style="P4_content">[[ o.init_debit or '0.0' ]]</para>
           </td>
@@ -378,7 +378,7 @@
           <td>
             <para style="P4_content">[[ o.init_debit - o.init_credit or '0.0' ]]</para>
           </td>
-   
+
         </tr>
         <tr>[[ repeatIn(lines(o, data['form']), 'line') ]]
           <td>
@@ -412,15 +412,15 @@
             <para style="P4_content">[[ line['progress'] and line['progress'] or '0.0' ]]</para>
           </td>
         </tr>
-      	
-      	</blockTable> 
+
+      	</blockTable>
         	</td>
         </tr>
-     </blockTable> 
+     </blockTable>
      <para style="P12">
       <font color="white"> </font>
     </para>
-     
-    
+
+
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py
index afc5635527c..6d7f7a9bf16 100755
--- a/addons/account/report/third_party_ledger.py
+++ b/addons/account/report/third_party_ledger.py
@@ -204,7 +204,7 @@ class third_party_ledger(rml_parse.rml_parse):
 				"FROM account_move_line AS line, account_account AS account " \
 				"WHERE line.partner_id IS NOT NULL " \
 					"AND line.account_id = account.id " \
-					"AND line.date < %s " \
+					"AND line.date <= %s " \
 					"AND line.reconcile_id IS NULL " \
 #					"AND line.account_id IN (" + self.account_ids + ") " \
 					" " + PARTNER_REQUEST + " " \
diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py
index f4b9c5aadfc..7a638f3d0db 100755
--- a/addons/account/wizard/wizard_third_party_ledger.py
+++ b/addons/account/wizard/wizard_third_party_ledger.py
@@ -79,8 +79,8 @@ period_fields = {
         'required':True
     },
 	'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
-	'reconcil':{'string':"	   Inclure les ecritures reconsiliees",'type':'boolean'},
-	'page_split':{'string':"Un partenaire par page",'type':'boolean'},
+	'reconcil':{'string':"	   Include Reconciled Entries",'type':'boolean'},
+	'page_split':{'string':"One Partner Per Page",'type':'boolean'},
 	'date1': {'string':'  Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
 	'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
 }
diff --git a/addons/association_vertical/aso_vertical_view.xml b/addons/association_vertical/aso_vertical_view.xml
index cb810f113d1..219cea03776 100644
--- a/addons/association_vertical/aso_vertical_view.xml
+++ b/addons/association_vertical/aso_vertical_view.xml
@@ -6,15 +6,15 @@
 			<field eval="&quot;terp-calendar&quot;" name="icon"/>
 			<field eval="False" name="parent_id"/>
 		</record>
-	<record id="association_vertical.menu_crm_case_fund_raise" model="ir.ui.menu">
+	<!--<record id="association_vertical.menu_crm_case_fund_raise" model="ir.ui.menu">
 			<field eval="&quot;Fund Raising&quot;" name="name"/>
 			<field eval="&quot;terp-account&quot;" name="icon"/>
 			<field eval="False" name="parent_id"/>
-		</record>
+		</record>-->
 		<record id="product.menu_main_product" model="ir.ui.menu">
 			<field model="ir.ui.menu" name="parent_id" search="[('name','=','Configuration'),('parent_id.name','=','Financial Management')]"/>
 		</record>
-		
+
 		<!-- For Shortcuts menu
 	 -->
 	 <!--
@@ -25,8 +25,8 @@
 			<field name="sequence">4</field>
 			<field name="res_id" ref="crm_configuration.menu_crm_case_categ_meet_my"/>
 		</record>
-		
-		
+
+
 		<record model="ir.ui.view_sc" id="ir_ui_view_sc_myopenprojects1">
 			<field name="name">&quot;My Open Projects&quot;</field>
 			<field name="user_id" ref="base.user_admin"/>
@@ -34,7 +34,7 @@
 			<field name="sequence">4</field>
 			<field name="res_id" ref="project.menu_open_view_my_project_open"/>
 		</record>
-		
+
 		<record id="ir_ui_view_sc_myopenprojects1" model="ir.ui.view_sc">
 			<field ref="project.menu_open_view_my_project_open" name="res_id"/>
 			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
@@ -48,7 +48,7 @@
 			<field eval="&quot;Products&quot;" name="name"/>
 			<field name="user_id" ref="base.user_root"/>
 		</record>
-		
+
 		<record id="ir_ui_view_sc_events0" model="ir.ui.view_sc">
 			<field ref="event.menu_event_event" name="res_id"/>
 			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index f8de1e6bfa8..d469ef9d072 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -52,6 +52,8 @@ view_form_profit = """<?xml version="1.0"?>
 
 view_form_company = """<?xml version="1.0"?>
 <form string="Setup">
+    <notebook colspan="4">
+    <page string="General Information">
     <image name="gtk-dialog-info" colspan="2"/>
     <group>
         <separator string="Define Main Company" colspan="4"/>
@@ -67,12 +69,18 @@ view_form_company = """<?xml version="1.0"?>
         <field name="email" align="0.0"/>
         <field name="phone" align="0.0"/>
         <field name="currency" align="0.0"/>
+    </group>
+    </page>
+    <page string="Report Information">
         <separator string="Report header" colspan="4"/>
         <newline/>
         <field name="rml_header1" align="0.0" colspan="4"/>
         <field name="rml_footer1" align="0.0" colspan="4"/>
         <field name="rml_footer2" align="0.0" colspan="4"/>
-    </group>
+        <separator colspan="4" string="Your Logo - Use a size of about 450x150 pixels."/>
+        <field colspan="4" name="logo" widget="image"/>
+    </page>
+    </notebook>
 </form>"""
 
 view_form_update = """<?xml version="1.0"?>
@@ -110,8 +118,6 @@ class wizard_base_setup(wizard.interface):
         res.sort()
         return res
 
-
-
     def _get_company(self, cr, uid, data, context):
         pool=pooler.get_pool(cr.dbname)
         company_obj=pool.get('res.company')
@@ -121,28 +127,10 @@ class wizard_base_setup(wizard.interface):
         company=company_obj.browse(cr, uid, ids)[0]
         self.fields['name']['default']=company.name
         self.fields['currency']['default']=company.currency_id.id
+        serv_pro_id = pooler.get_pool(cr.dbname).get('ir.module.module').search(cr, uid, [('name','=','profile_service')]) or False
+        if serv_pro_id:
+            return {'profile':serv_pro_id[0]}
         return {}
-        #self.fields['rml_header1']['default']=company.rml_header1
-        #self.fields['rml_footer1']['default']=company.rml_footer1
-        #self.fields['rml_footer2']['default']=company.rml_footer2
-        #if not company.partner_id.address:
-        #   return {}
-        #address=company.partner_id.address[0]
-        #self.fields['street']['default']=address.street
-        #self.fields['street2']['default']=address.street2
-        #self.fields['zip']['default']=address.zip
-        #self.fields['city']['default']=address.city
-        #self.fields['email']['default']=address.email
-        #self.fields['phone']['default']=address.phone
-        #if address.state_id:
-        #   self.fields['state_id']['default']=address.state_id.id
-        #else:
-        #   self.fields['state_id']['default']=-1
-        #if address.country_id:
-        #   self.fields['country_id']['default']=address.country_id.id
-        #else:
-        #   self.fields['country_id']['default']=-1
-        #return {}
 
     def _get_states(self, cr, uid, context):
         pool=pooler.get_pool(cr.dbname)
@@ -161,6 +149,14 @@ class wizard_base_setup(wizard.interface):
         res.sort(lambda x,y: cmp(x[1],y[1]))
         return res
 
+    def _get_currency(self, cr, uid, context):
+        pool=pooler.get_pool(cr.dbname)
+        currency_obj=pool.get('res.currency')
+        ids=currency_obj.search(cr, uid, [])
+        res=[(currency.id, currency.name) for currency in currency_obj.browse(cr, uid, ids)]
+        res.sort(lambda x,y: cmp(x[1],y[1]))
+        return res
+
     def _update(self, cr, uid, data, context):
         pool=pooler.get_pool(cr.dbname)
         form=data['form']
@@ -168,7 +164,6 @@ class wizard_base_setup(wizard.interface):
             module_obj=pool.get('ir.module.module')
             module_obj.state_update(cr, uid, [data['form']['profile']], 'to install', ['uninstalled'], context)
 
-
         company_obj=pool.get('res.company')
         partner_obj=pool.get('res.partner')
         address_obj=pool.get('res.partner.address')
@@ -180,6 +175,7 @@ class wizard_base_setup(wizard.interface):
                 'rml_footer1': form['rml_footer1'],
                 'rml_footer2': form['rml_footer2'],
                 'currency_id': form['currency'],
+                'logo': form['logo'],
             })
         partner_obj.write(cr, uid, [company.partner_id.id], {
                 'name': form['name'],
@@ -275,7 +271,7 @@ class wizard_base_setup(wizard.interface):
             'string':'Profile',
             'type':'selection',
             'selection':_get_profiles,
-            'default': -1,
+#            'default': _get_service_profile,
             'required': True,
         },
 
@@ -326,8 +322,8 @@ class wizard_base_setup(wizard.interface):
         },
         'currency': {
             'string': 'Currency',
-            'type': 'many2one',
-            'relation': 'res.currency',
+            'type': 'selection',
+            'selection':_get_currency,
             'required': True,
         },
         'rml_header1':{
@@ -354,6 +350,10 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
             'type': 'char',
             'size': 200,
         },
+        'logo':{
+            'string': 'Logo',
+            'type': 'binary',
+        },
     }
     states={
         'init':{
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index 7ab564bf011..82321f43dec 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -59,6 +59,14 @@
       <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"/>
+      <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_Final_total">
       <blockAlignment value="LEFT"/>
@@ -104,6 +112,7 @@
     <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_9_bold_right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_italic_8" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
   <images/>
   <story>
@@ -201,6 +210,46 @@
             <para style="terp_default_Right_9">[[ company.currency_id.name ]]</para>
           </td>
         </tr>
+        <tr>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_italic_8">[[ format(line.analytic_account and line.analytic_account.complete_name or removeParentNode('tr')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
       </blockTable>
     </section>
     <blockTable colWidths="57.0,171.0,171.0,32.0,71.0,21.0" style="Table_Final_total">
@@ -248,4 +297,4 @@
     </para>
     <para style="terp_default_9">This document must be dated and signed for reimbursment</para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 5f488738e1a..1029118f32c 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -81,7 +81,7 @@
 			<field name="act_window_id" ref="action_membership_products"/>
 		</record>
 
-		<menuitem name="Membership" id="menu_membership"/>
+		<menuitem name="Membership" id="menu_membership" icon="terp-crm"/>
 		<menuitem name="Configuration" parent="menu_membership"
 			id="menu_conf"
 			sequence="1"/>