diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index eb6695264de..88b9a274710 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -28,7 +28,7 @@ import account_general_ledger
 import account_partner_ledger
 import invoice
 import overdue
-import aged_trial_balance
+import account_aged_partner_balance
 import tax_report
 #import account_tax_code
 import account_balance_landscape
diff --git a/addons/account/report/aged_trial_balance.py b/addons/account/report/account_aged_partner_balance.py
similarity index 57%
rename from addons/account/report/aged_trial_balance.py
rename to addons/account/report/account_aged_partner_balance.py
index 43db65f25c9..515c9edf8c0 100644
--- a/addons/account/report/aged_trial_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -18,20 +18,20 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 import pooler
 import rml_parse
 from report import report_sxw
+from common_report_header import common_report_header
 
-class aged_trial_report(rml_parse.rml_parse):
+class aged_trial_report(rml_parse.rml_parse, common_report_header):
 
 	def __init__(self, cr, uid, name, context):
 		super(aged_trial_report, self).__init__(cr, uid, name, context=context)
-		self.line_query = ''
+		self.query_line = ''
 		self.total_account = []
-
-
 		self.localcontext.update({
 			'time': time,
 			'get_lines': self._get_lines,
@@ -40,11 +40,20 @@ class aged_trial_report(rml_parse.rml_parse):
 			'get_for_period': self._get_for_period,
 			'get_company': self._get_company,
 			'get_currency': self._get_currency,
-
+			'get_partners':self._get_partners,
+			'get_account': self._get_account,
+			'get_fiscalyear': self._get_fiscalyear,
 		})
 
+	def set_context(self, objects, data, ids, report_type=None):
+		self.query = data['form'].get('query_line', '')
+		self.direction_selection = data['form'].get('direction_selection', 'past')
+		self.date_from = data['form'].get('date_from', time.strftime('%Y-%m-%d'))
+		return super(aged_trial_report, self).set_context(objects, data, ids, report_type=report_type)
 
 	def _get_lines(self, form):
+		res = []
+		account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
 		if (form['result_selection'] == 'customer' ):
 			self.ACCOUNT_TYPE = ['receivable']
 		elif (form['result_selection'] == 'supplier'):
@@ -52,74 +61,68 @@ class aged_trial_report(rml_parse.rml_parse):
 		else:
 			self.ACCOUNT_TYPE = ['payable','receivable']
 
-
-		res = []
-		account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
-		self.line_query = account_move_line_obj._query_get(self.cr, self.uid, obj='line',
-				context={'fiscalyear': form['fiscalyear']})
-		self.cr.execute("""SELECT DISTINCT res_partner.id AS id,
-					res_partner.name AS name
-				FROM res_partner,account_move_line AS line, account_account
-				WHERE (line.account_id=account_account.id)
-					AND ((reconcile_id IS NULL)
-					OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))
-					AND (line.partner_id=res_partner.id)
-					AND (account_account.company_id = %s)
-				ORDER BY res_partner.name""" , (form['date1'],form['company_id']))
+		self.cr.execute('SELECT DISTINCT res_partner.id AS id,\
+					res_partner.name AS name \
+				FROM res_partner,account_move_line AS l, account_account\
+				WHERE (l.account_id=account_account.id)\
+					AND ((reconcile_id IS NULL)\
+					OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+					AND (l.partner_id=res_partner.id)\
+					AND ' + self.query + ' \
+				ORDER BY res_partner.name' , (self.date_from,))
 		partners = self.cr.dictfetchall()
 		## mise a 0 du total
 		for i in range(7):
 			self.total_account.append(0)
 		#
-
 		# Build a string like (1,2,3) for easy use in SQL query
 		partner_ids = [x['id'] for x in partners]
 
 		# This dictionary will store the debit-credit for all partners, using partner_id as key.
 		totals = {}
-		self.cr.execute("""SELECT partner_id, SUM(debit-credit)
-					FROM account_move_line AS line, account_account
-				    WHERE (line.account_id = account_account.id)
-					AND (account_account.type IN %s)
-					AND (partner_id IN %s)
-					AND ((reconcile_id IS NULL)
-					OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))
-					AND (account_account.company_id = %s)
-					AND account_account.active
-					GROUP BY partner_id""" , (tuple(self.ACCOUNT_TYPE), tuple(partner_ids),form['date1'],form['company_id'],))
+		self.cr.execute('SELECT partner_id, SUM(debit-credit) \
+					FROM account_move_line AS l, account_account\
+				    WHERE (l.account_id = account_account.id)\
+					AND (account_account.type IN %s)\
+					AND (partner_id IN %s)\
+					AND ((reconcile_id IS NULL)\
+					OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+					AND ' + self.query + '\
+					AND account_account.active\
+					GROUP BY partner_id ' , (tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from,))
 		t = self.cr.fetchall()
 		for i in t:
 			totals[i[0]] = i[1]
 
 		# This dictionary will store the future or past of all partners
 		future_past = {}
-		if form['direction_selection'] == 'future':
-			self.cr.execute("""SELECT partner_id, SUM(debit-credit)
-						FROM account_move_line AS line, account_account
-						WHERE (line.account_id=account_account.id)
-						AND (account_account.type IN %s)
-						AND (COALESCE(date_maturity,date) < %s)
-						AND (partner_id IN %s)
-						AND ((reconcile_id IS NULL)
-						OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))
-						AND (account_account.company_id = %s)
-						AND account_account.active
-						GROUP BY partner_id""", (tuple(self.ACCOUNT_TYPE), form['date1'], tuple(partner_ids),form['date1'], form['company_id'],))
+		if self.direction_selection == 'future':
+			self.cr.execute('SELECT partner_id, SUM(debit-credit) \
+						FROM account_move_line AS l, account_account\
+						WHERE (l.account_id=account_account.id)\
+						AND (account_account.type IN %s)\
+						AND (COALESCE(date_maturity, date) < %s)\
+						AND (partner_id IN %s)\
+						AND ((reconcile_id IS NULL)\
+						OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+						AND '+ self.query + '\
+						AND account_account.active\
+						GROUP BY partner_id', (tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids),self.date_from,))
 			t = self.cr.fetchall()
 			for i in t:
 				future_past[i[0]] = i[1]
-		elif form['direction_selection'] == 'past': # Using elif so people could extend without this breaking
-			self.cr.execute("""SELECT partner_id, SUM(debit-credit)
-					FROM account_move_line AS line, account_account
-					WHERE (line.account_id=account_account.id)
-						AND (account_account.type IN %s)
-						AND (COALESCE(date_maturity,date) > %s)
-						AND (partner_id IN %s)
-						AND ((reconcile_id IS NULL)
-						OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))
-						AND (account_account.company_id = %s)
-						AND account_account.active
-						GROUP BY partner_id""" , (tuple(self.ACCOUNT_TYPE), form['date1'], tuple(partner_ids), form['date1'], form['company_id'],))
+		elif self.direction_selection == 'past': # Using elif so people could extend without this breaking
+			self.cr.execute('SELECT partner_id, SUM(debit-credit) \
+					FROM account_move_line AS l, account_account\
+					WHERE (l.account_id=account_account.id)\
+						AND (account_account.type IN %s)\
+						AND (COALESCE(date_maturity,date) > %s)\
+						AND (partner_id IN %s)\
+						AND ((reconcile_id IS NULL)\
+						OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+						AND '+ self.query + '\
+						AND account_account.active\
+						GROUP BY partner_id' , (tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids), self.date_from,))
 			t = self.cr.fetchall()
 			for i in t:
 				future_past[i[0]] = i[1]
@@ -128,18 +131,17 @@ class aged_trial_report(rml_parse.rml_parse):
 		# Each history will contain : history[1] = {'<partner_id>': <partner_debit-credit>}
                 history = []
                 for i in range(5):
-			self.cr.execute("""SELECT partner_id, SUM(debit-credit)
-					FROM account_move_line AS line, account_account
-					WHERE (line.account_id=account_account.id)
-						AND (account_account.type IN %s)
-						AND (COALESCE(date_maturity,date) BETWEEN %s AND %s)
-						AND (partner_id IN %s)
-						AND ((reconcile_id IS NULL)
-						OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))
-						AND (account_account.company_id = %s)
-						AND account_account.active
-					GROUP BY partner_id""" , (tuple(self.ACCOUNT_TYPE), form[str(i)]['start'], form[str(i)]['stop'], tuple(partner_ids) ,form['date1'] ,form['company_id'],))
-
+			self.cr.execute('SELECT partner_id, SUM(debit-credit)\
+					FROM account_move_line AS l, account_account\
+					WHERE (l.account_id = account_account.id)\
+						AND (account_account.type IN %s)\
+						AND (COALESCE(date_maturity,date) BETWEEN %s AND %s)\
+						AND (partner_id IN %s)\
+						AND ((reconcile_id IS NULL)\
+						OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+						AND '+ self.query + '\
+						AND account_account.active\
+					GROUP BY partner_id' , (tuple(self.ACCOUNT_TYPE), form[str(i)]['start'], form[str(i)]['stop'], tuple(partner_ids) ,self.date_from,))
 			t = self.cr.fetchall()
 			d = {}
 			for i in t:
@@ -149,16 +151,14 @@ class aged_trial_report(rml_parse.rml_parse):
 		for partner in partners:
 			values = {}
 			## If choise selection is in the future
-			if form['direction_selection'] == 'future':
+			if self.direction_selection == 'future':
 				# Query here is replaced by one query which gets the all the partners their 'before' value
 				before = False
 				if future_past.has_key(partner['id']):
 					before = [ future_past[partner['id']] ]
-
 				self.total_account[6] = self.total_account[6] + (before and before[0] or 0.0)
-
 				values['direction'] = before and before[0] or 0.0
-			elif form['direction_selection'] == 'past': # Changed this so people could in the future create new direction_selections
+			elif self.direction_selection == 'past': # Changed this so people could in the future create new direction_selections
 				# Query here is replaced by one query which gets the all the partners their 'after' value
 				after = False
 				if future_past.has_key(partner['id']): # Making sure this partner actually was found by the query
@@ -211,15 +211,17 @@ class aged_trial_report(rml_parse.rml_parse):
 		period = self.total_account[int(pos)]
 		return period
 
-	def _get_company(self, form):
-		return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).name
-
-	def _get_currency(self, form):
-		return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).currency_id.name
-
+	def _get_partners(self,data):
+		if data['form']['result_selection'] == 'customer':
+		    return 'Receivable Accounts'
+		elif data['form']['result_selection'] == 'supplier':
+		    return 'Payable Accounts'
+		elif data['form']['result_selection'] == 'customer_supplier':
+		    return 'Receivable and Payable Accounts'
+		return ''	
 
 report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner',
-		'addons/account/report/aged_trial_balance.rml',parser=aged_trial_report,header=False)
+		'addons/account/report/account_aged_partner_balance.rml',parser=aged_trial_report, header=False)
 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/report/aged_trial_balance.rml b/addons/account/report/account_aged_partner_balance.rml
similarity index 63%
rename from addons/account/report/aged_trial_balance.rml
rename to addons/account/report/account_aged_partner_balance.rml
index e566cb4a26d..78c7af3b2af 100644
--- a/addons/account/report/aged_trial_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -3,33 +3,6 @@
     <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
        <frame id="first" x1="20.0" y1="35.0" width="1080" height="650"/>
-			<pageGraphics>
-				<!--logo-->
-				<!--<fill color="darkblue"/>-->
-				<!--<stroke color="darkblue"/>-->
-
-				<!--TITLE COMPANY-->
-				<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
-
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.5cm" y="25.00cm">[[ company.name ]]</drawString>
-				<drawString x="33.90cm" y="25.00cm">Age Partner Balance - [[ get_currency(data['form']) ]]</drawString>
-
-				<!--COL 2-->
-				<setFont name="Helvetica" size="9"/>
-				
-				<drawString x="1.5cm" y="0.90cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
-				<drawString x="36.90cm" y="0.90cm">Page <pageNumber/></drawString>
-				
-				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-
-			    <lineMode width="0.7"/>
-				<lines>1.5cm 24.70cm 38.00cm 24.70cm</lines>
-				<setFont name="Helvetica" size="8"/>
-			    </pageGraphics>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -47,6 +20,10 @@
       <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
       <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table_header_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>    
     <blockTableStyle id="Tableau1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -60,6 +37,38 @@
       <blockValign value="TOP"/>
       <blockAlignment value="LEFT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,1" stop="0,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,1" stop="2,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,1" stop="3,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,1" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="4,1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,1" stop="4,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    
     <blockTableStyle id="Tableau3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -95,8 +104,64 @@
     <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Caption" fontName="Helvetica" fontSize="8.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
+	<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.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" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" 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"/>		    
   </stylesheet>
   <story>
+    <para style="P9">
+      <font color="white"> </font>
+    </para>
+     <blockTable colWidths="180.0,180.0,180.0" style="Table_header_Content">
+      <tr>
+        <td><para style="terp_header"><font color="white"> </font></para>
+        </td>
+        <td><para style="terp_header_Centre">Aged Trial balance</para></td>
+        <td><para style="terp_header"><font color="white"> </font></para></td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="200.0,100.0,133.0,219.0,185.0" style="Table8">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Chart of Account</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Fiscal Year</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Start Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Partner's</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Printing Date</para>
+        </td>
+      </tr>
+ 		<tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ data['form']['date_from'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_partners(data) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True)]]</para>
+        </td>
+      </tr>      
+      </blockTable>
+  	<para style="P9">
+      <font color="white"> </font>
+    </para>  <para style="P9">
+      <font color="white"> </font>
+    </para>      
     <blockTable colWidths="300.0,100.0,100.0,100.0,100.0,105.0,105.0,125.0" style="Table2" repeatRows="1">
       <tr>
         <td>
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index a5b4e211b33..e11a0d7b44c 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -209,9 +209,9 @@
     <para style="P11">
       <font color="white"> </font>
     </para>    
-    <blockTable colWidths="100.0,60.0,88.0,140.0,90.0" style="Table8">
+    <blockTable colWidths="120.0,80.0,88.0,140.0,90.0" style="Table8">
       <tr>
-        <td><para style="terp_tblheader_General_Right">Company <font color="white"> [[ data['model']=='account.account' or removeParentNode('para') ]]</font></para>        
+        <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]]</para>        
       	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>       
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 816afa59cb8..f31ae1d50ab 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -244,8 +244,8 @@
     </para>
 	<blockTable colWidths="80.0,80.0,100.0,130.0,100.0" style="Table2">
 		<tr>
-		<td><para style="terp_tblheader_General_Right">Company <font color="white"> [[ data['model']=='account.journal.period' or removeParentNode('para') ]]</font></para>        
-      	 <para style="terp_tblheader_General_Centre">Chart of Account <font color="white"> [[ data['model']=='ir.ui.menu' or removeParentNode('para') ]]</font></para></td>        
+		<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>        
+      	 <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>        
 	        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
 			<td><para style="terp_tblheader_General_Centre">Journal</para></td>        
 	        <td><para style="terp_tblheader_General_Centre">Filter By  [[get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index 77f750196d4..c8f23e7631f 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -224,8 +224,8 @@
     </blockTable>
       <blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2">
       <tr>
-      	<td><para style="terp_tblheader_General_Right">Company <font color="white"> [[ data['model']=='account.journal.period' or removeParentNode('para') ]]</font></para>
-      	<para style="terp_tblheader_General_Centre">Chart of Account <font color="white"> [[ data['model']=='ir.ui.menu' or removeParentNode('para') ]]</font></para></td>
+      	<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
+      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
     	<td><para style="terp_tblheader_General_Centre">Journals</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and  get_filter(data) ]]</para></td>
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index 212c8bfc819..2a99b643bff 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -9,10 +9,8 @@
     </pageTemplate>
   </template>
    <stylesheet>
-
     <blockTableStyle id="tbl_header">
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-
       <blockValign value="TOP"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Company_Name">
@@ -20,12 +18,9 @@
       <blockValign value="TOP"/>
     </blockTableStyle>
     <blockTableStyle id="tbl_content">
-
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
       <blockValign value="TOP"/>
-
     </blockTableStyle>
-
     <blockTableStyle id="Table_Subheader_Content_detail">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -194,12 +189,10 @@
     <para style="P9">
       <font color="white"> </font>
     </para>
-
    <para>[[ repeatIn(objects, 'a') ]]</para>
-
-    <blockTable colWidths="80.0,70.0,70.0,80.0,110.0,80.0,80.0" style="Table2">
+    <blockTable colWidths="80.0,70.0,70.0,80.0,100.0,70.0,80.0" style="Table2">
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chat Account</para></td>
+      	<td><para style="terp_tblheader_General_Centre">Chart of Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
 		<td><para style="terp_tblheader_General_Centre">Journals</para></td>
 		<td><para style="terp_tblheader_General_Centre">Display Account </para></td>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 07b16bb11ce..fe090650d40 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -204,10 +204,10 @@
       <font color="white"> </font>
     </para>
 
-      <blockTable colWidths="200.0,100.0,100.0,80.0,150.0,100.0,100.0" style="Table2">
+      <blockTable colWidths="150.0,100.0,100.0,80.0,150.0,100.0,100.0" style="Table2">
       <tr>
-      <td><para style="terp_tblheader_General_Right">Company <font color="white"> [[ data['model']=='account.account' or removeParentNode('para') ]]</font></para>        
-      	<para style="terp_tblheader_General_Centre">Chart of Account <font color="white"> [[ data['model']=='ir.ui.menu' or removeParentNode('para') ]]</font></para></td>       
+      <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>        
+      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>       
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
        	<td><para style="terp_tblheader_General_Centre">Journals</para></td>
 		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>        
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index a308331a8fd..75d2fa2070b 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -205,8 +205,8 @@
     </para>
       <blockTable colWidths="80.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
       <tr>
-      	<td><para style="terp_tblheader_General_Right">Company <font color="white"> [[ data['model']=='account.journal.period' or removeParentNode('para') ]]</font></para>
-      	<para style="terp_tblheader_General_Centre">Chart of Account <font color="white"> [[ data['model']=='ir.ui.menu' or removeParentNode('para') ]]</font></para></td>
+      	<td><para style="terp_tblheader_General_Centre">  [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para>
+      	<para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
 		<td><para style="terp_tblheader_General_Centre">Journal</para></td>
         <td><para style="terp_tblheader_General_Centre">Filters By </para></td>
diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml
index fba666fe319..7ee04a79e2b 100644
--- a/addons/account/report/account_partner_balance.rml
+++ b/addons/account/report/account_partner_balance.rml
@@ -189,7 +189,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-        <blockTable colWidths="80.0,80.0,100.0,140.0,80.0,80.0" style="Table2_header">
+        <blockTable colWidths="80.0,80.0,80.0,130.0,80.0,80.0" style="Table2_header">
       <tr>
       	 <td><para style="terp_tblheader_General_Centre">Chart of Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 206b5f3052d..b6e564d26d0 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -178,6 +178,9 @@
         </td>
       </tr>
     </blockTable>
+        <para style="P4">
+      <font color="white"> </font>
+    </para>
         <para style="terp_default_2">
       <font color="white"> </font>
     </para>
@@ -227,7 +230,18 @@
      <para style="P4">
       <font color="white"> </font>
     </para>
-    
+        <para style="P4">
+      <font color="white"> </font>
+    </para>
+            <para style="P4">
+      <font color="white"> </font>
+    </para>
+       <para style="P4">
+      <font color="white"> </font>
+    </para>
+      <para style="P4">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="65.0,28.0,45.0,175.0,77.0,75.0,74.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td>
diff --git a/addons/account/report/wizard_account_journal.rml b/addons/account/report/wizard_account_journal.rml
deleted file mode 100644
index 28c6df89a9a..00000000000
--- a/addons/account/report/wizard_account_journal.rml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
-      	<header>
-			<pageGraphics>
-				<!--logo-->
-				<!--<fill color="darkblue"/>-->
-				<!--<stroke color="darkblue"/>-->
-
-				<!--TITLE COMPANY-->
-				<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
-
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">Print Journal - [[ company.currency_id.name ]]</drawRightString>
-
-
-				<!-- Header -->
-
-
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</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>
-				<setFont name="Helvetica" size="8"/>
-			</pageGraphics>
-		</header>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
-       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
-       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-
-
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10a" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10b" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11a" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <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_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.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_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" 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="15.0" leading="19" 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_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" 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_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-  	<section>
-  	<para style="Table Contents">[[ repeatIn(objects, 'o') ]]</para>
-  	<blockTable colWidths="65.0,62.0,58.0,62.0,174.0,57.0,61.0" style="Table1" repeatRows="1">
-  	<para style="terp_default_8">[[repeatIn(lines(data['form']['periods'],data['form']['journal_ids'],data['form']['sort_selection']), 'line') ]]</para>  
-      <tr>
-        <td>
-          <para style="P10a">Date</para>
-        </td>
-        <td>
-          <para style="P10">Voucher No</para>
-        </td>
-        <td>
-          <para style="P10">A/c No.</para>
-        </td>
-        <td>
-          <para style="P10a">Third party</para>
-        </td>
-        <td>
-          <para style="P10a">Entry label</para>
-        </td>
-        <td>
-          <para style="P10b">Debit</para>
-        </td>
-        <td>
-          <para style="P10b">Credit</para>
-        </td>
-      </tr>
-       <tr>
-        <td>
-            <para style="P11">[[ line[0].period_id.name ]]</para>
-        </td>
-        <td>
-          <para style="P11a">[[line[0].journal_id.code ]]</para></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td>
-          <para style="P12"><u>[[ formatLang(sum_debit(line[0].period_id.id, line[0].journal_id.id))  ]]</u></para>
-        </td>
-        <td>
-          <para style="P12"><u>[[ formatLang(sum_credit(line[0].period_id.id, line[0].journal_id.id))  ]]</u></para>
-        </td>
-      </tr >
-       <tr>
-      <para style="terp_default_8">[[repeatIn(line,'l')]]</para>
-        <td>
-          <para style="terp_default_8">[[ formatLang(l.date,date=True) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ l.ref ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ l.account_id.code ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_8">[[ l.partner_id and l.partner_id.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_8">[[ l.name ]]</para>
-        </td>
-        <td>
-          <para style="P8">[[ formatLang(l.debit)  ]]</para>
-        </td>
-        <td>
-          <para style="P8">[[ formatLang(l.credit) ]]</para>
-        </td>
-        <para style="Standard">
-      <font color="white"> </font>
-    </para>
-      </tr>
-     </blockTable>
-     <pageBreak></pageBreak>
-   </section> 
-  </story>
-</document>
\ No newline at end of file
diff --git a/addons/account/report/wizard_central_journal.rml b/addons/account/report/wizard_central_journal.rml
deleted file mode 100644
index 1a8d9b62187..00000000000
--- a/addons/account/report/wizard_central_journal.rml
+++ /dev/null
@@ -1,277 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
-      <header>
-			<pageGraphics>
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">Central Journal-[[ company.currency_id.name ]]</drawRightString>
-
-				<!-- Header -->
-
-
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</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>
-				<setFont name="Helvetica" size="8"/>
-
-			</pageGraphics>
-		</header>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Company_Name">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_header_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Sub_Header_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Subheader_Content_detail">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Account_detail_Title">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Final_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Journal_Line_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <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"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <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="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_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" 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_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story> 
-  <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
-    <!--blockTable colWidths="180.0,180.0,180.0" style="Table_header_Content">
-      <tr>
-        <td>
-          <para style="terp_header">[[ company.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_header">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_header">Central Journal-[[ company.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable-->
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Central Journal</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="108.0,108.0,108.0,108.0,108.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"/>
-      <tr>
-        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Journal Code</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Journal Name</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Printing Date</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="108.0,108.0,108.0,108.0,108.0" style="Table_Subheader_Content_detail">
-      <tr>
-      <td><para style="terp_default_Centre_9">[[ get_start_date(data['form']) ]]</para></td>
-        <td><para style="terp_default_Centre_9">[[ get_end_date(data['form']) ]]</para></td>
-        <td>
-          <para style="terp_default_Centre_9">[[ line[0]['journal'].code or '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_9">[[ line[0]['journal'].name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_9">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="83.0,272.0,95.0,89.0" style="Table_Account_detail_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Account Num.</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Account Name</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-      </tr>
-
-      <tr>
-      <td>
-	    <blockTable colWidths="80.0,272.0,94.0,87.0" style="Table_Final_Total">
-	      <tr>
-	        <td>
-	          <para style="terp_default_Bold_9">Total:</para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9">
-	          <font color="white"> </font>
-	          </para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit(line[0]['period'].id, line[0]['journal'].id)) ]]</para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit(line[0]['period'].id, line[0]['journal'].id)) ]]</para>
-	        </td>
-	      </tr>
-	      <tr>
-      <td>
-	      <blockTable colWidths="80.0,272.0,94.0,87.0" style="Table_Journal_Line_Content">
-	        <tr>
-	         <para style="terp_default_8">[[repeatIn(line,'l')]]</para>
-	          <td>
-	            <para style="terp_default_9">d[[ l['code'] ]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_9">[[ l['name'] ]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Right_9">[[ formatLang(l['debit']) ]]</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Right_9">[[ formatLang(l['credit']) ]]</para>
-	          </td>
-	        </tr>
-	      </blockTable>
-	      
-   	  </td>
-   	  </tr>
-	    </blockTable>
-      </td>
-      </tr>
-   	 </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/account/report/wizard_general_journal.rml b/addons/account/report/wizard_general_journal.rml
deleted file mode 100644
index d436ae87bed..00000000000
--- a/addons/account/report/wizard_general_journal.rml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(596.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-    <pageTemplate id="first">
-     <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
-      <header>
-			<pageGraphics>
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">General Journal - [[ company.currency_id.name ]]</drawRightString>
-
-				<!-- Header -->
-
-
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</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>
-				<setFont name="Helvetica" size="8"/>
-
-			</pageGraphics>
-		</header>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Header_Title">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Company_Name">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Print_Current_datetime">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Journal_Title">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Final_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Sub_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,0" stop="2,2"/>
-      <lineStyle kind="LINEBELOW" colorName="white" start="0,1" stop="-1,1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Journal_Detail">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Sub_Header_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Subheader_Content_detail">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <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="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_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" 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_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <!--blockTable colWidths="180.0,180.0,180.0" style="Table_Header_Title">
-      <tr>
-        <td>
-          <para style="terp_header">[[ company.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_header">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_header">General Journal - [[ company.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable-->
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">General Journal</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P2">
-        <font color="white"> </font>
-    </para>
-    <para style="P9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="180.0,180.0,180.0" style="Table_Sub_Header_Content">
-      <tr>
-        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
-        <td><para style="terp_tblheader_Details_Centre">Printing Date</para></td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="180.0,180.0,180.0" style="Table_Subheader_Content_detail">
-      <tr>
-        <td><para style="terp_default_Centre_9">[[ get_start_date(data['form']) ]]</para></td>
-        <td><para style="terp_default_Centre_9">[[ get_end_date(data['form']) ]]</para></td>
-        <td><para style="terp_default_Centre_9">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] </para></td>
-      </tr>
-    </blockTable>
-    <para style="P9">
-      <font color="white"> </font>
-    </para>    
-    <section>
-    <para style="P9">
-      <font color="white"> </font>
-   </para>
-    <blockTable colWidths="61.0,228.0,95.0,80.0,73.0" style="Table_Journal_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Jrl Code</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Journal Name</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Period</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit Trans.</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit Trans.</para>
-        </td>
-      </tr>
-      <tr>
-      <td>
-	    <blockTable colWidths="64.0,226.0,82.0,82.0,76.0" style="Table_Final_Total">
-	      <tr>
-	        <td>
-	          <para style="terp_default_Bold_9">Total:</para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9">
-	            <font color="white"> </font>
-	          </para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9">
-	            <font color="white"> </font>
-	          </para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9_Right"><u>[[ formatLang(sum_debit(data['form']['periods'],data['form']['journal_ids'])) ]]</u></para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9_Right"><u>[[ formatLang(sum_credit(data['form']['periods'],data['form']['journal_ids'])) ]]</u></para>
-	        </td>
-	      </tr>
-	    </blockTable>
-	   </td>
-	   </tr>
-
-	   <tr>
-	   <td>
-
-       <para style="terp_default_9"><font>[[ repeatIn( lines( data['form']['periods'], data['form']['journal_ids'] ),'line')]]</font></para>
-	      <blockTable colWidths="175.0,115.0,82.0,82.0,75.0" style="Table_Sub_Total">
-	        <tr>
-	          <td>
-	            <para style="terp_default_Bold_9">[[ line[0]['period_name'] ]] :</para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Bold_9">
-	              <font color="white"> </font>
-	            </para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Bold_9">
-	              <font color="white"> </font>
-	            </para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Bold_9_Right"><u>[[ formatLang(sum_debit_period( line[0]['pid'],data['form']['journal_ids'])) ]]</u></para>
-	          </td>
-	          <td>
-	            <para style="terp_default_Bold_9_Right"><u>[[ formatLang(sum_credit_period(line[0]['pid'],data['form']['journal_ids'])) ]]</u></para>
-	          </td>
-	        </tr>
-			 <tr>
-			 <td>
-			      <blockTable colWidths="60.0,219.0,88.0,80.0,76.0" style="Table_Journal_Detail">
-			        <tr>
-			          <td>
-			           <para style="terp_default_9">[[ repeatIn(line,'l') ]]</para>
-			            <para style="terp_default_9">[[ l['code'] ]]</para>
-			          </td>
-			          <td>
-			            <para style="terp_default_9">[[ l['name'] ]]</para>
-			          </td>
-			          <td>
-			            <para style="terp_default_9">[[ line[0]['period_name'] ]]</para>
-			          </td>
-			          <td>
-			            <para style="terp_default_Right_9">[[ formatLang(l['debit'])]]</para>
-			          </td>
-			          <td>
-			            <para style="terp_default_Right_9">[[ formatLang(l['credit']) ]]</para>
-			          </td>
-			        </tr>
-			      </blockTable>
-			  </td>
-			  </tr>
-			  </blockTable>
-		</td>
-		</tr>
-	  </blockTable>
-    </section>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/account/wizard/account_general_ledger_report_view.xml b/addons/account/wizard/account_general_ledger_report_view.xml
deleted file mode 100644
index f98e80fb81f..00000000000
--- a/addons/account/wizard/account_general_ledger_report_view.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="account_general_ledger_report_view" model="ir.ui.view">
-            <field name="name">General Ledger</field>
-            <field name="model">account.general.ledger.report</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-			<form string="Select Date-Period">
-			    <field name="company_id" colspan="4" groups="base.group_multi_company"/>
-			    <newline/>
-			    <field name="fiscalyear"/>
-			    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
-			    <newline/>
-
-			    <field name="display_account" required="True"/>
-			    <field name="sortbydate" required="True"/>
-
-			    <field name="initial_balance" invisible="1"/>
-
-			    <field name="landscape"/>
-			    <field name="amount_currency"/>
-			    <newline/>
-			    <separator string="Filters" colspan="4"/>
-			    <field name="state" required="True"/>
-			    <newline/>
-			    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
-			        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
-			            <separator string="Date Filter" colspan="4"/>
-			            <field name="date_from"/>
-			            <field name="date_to"/>
-			        </group>
-			        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
-			            <separator string="Filter on Periods" colspan="4"/>
-			            <field name="periods" colspan="4" nolabel="1"/>
-			        </group>
-			    </group>
-    				<newline/>
-    				<group colspan="4" col="6">
-	     				<separator colspan="4"/>
-	     				<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	               		<button name="check_report" string="Print" type="object" icon="gtk-print"/>
-               		</group>
-			</form>
-            </field>
-        </record>
-
-		<record id="action_account_general_ledger_report" model="ir.actions.act_window">
-            <field name="name">General Ledger</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.general.ledger.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_general_ledger_report_view"/>
-            <field name="target">new</field>
-    	</record>
-
-		<record model="ir.values" id="account_general_ledger_report_values">
-            <field name="model_id" ref="account.model_account_account" />
-            <field name="object" eval="1" />
-            <field name="name">Account General Ledger</field>
-            <field name="key2">client_print_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_general_ledger_report'))" />
-            <field name="key">action</field>
-            <field name="model">account.account</field>
-        </record>
-
-        <record id="account_general_ledger_report_view1" model="ir.ui.view">
-            <field name="name">General Ledger</field>
-            <field name="model">account.general.ledger.report</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-		        <form string="Select Chart">
-		        	<field name="Account_list"/>
-		        	<separator colspan="4"/>
-		            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-		            <button name="next_view" string="Next" type="object" icon="gtk-go-forward" default_focus="1"/>
-		        </form>
-            </field>
-        </record>
-
-		<record id="action_account_general_ledger_menu" model="ir.actions.act_window">
-            <field name="name">Select Chart</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.general.ledger.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_general_ledger_report_view1"/>
-            <field name="target">new</field>
-    	</record>
-
-        <menuitem
-        	icon="STOCK_PRINT"
-	        name="General Ledger"
-	        parent="account.final_accounting_reports"
-	        action="action_account_general_ledger_menu"
-	        id="menu_general_ledger"
-	       />
-
-    </data>
-</openerp>
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index 5a534c3889f..b972aeb683c 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -22,67 +22,60 @@
 import time
 import datetime
 from mx.DateTime import *
+from lxml import etree
 
 from osv import osv, fields
 from tools.translate import _
 
 class account_aged_trial_balance(osv.osv_memory):
-
+    _inherit = 'account.common.partner.report'
     _name = 'account.aged.trial.balance'
     _description = 'Account Aged Trial balance Report'
 
     _columns = {
-        'company_id': fields.many2one('res.company', 'Company', required=True),
         'period_length':fields.integer('Period length (days)', required=True),
-        'date1': fields.date('Start of period', required=True),
-        'result_selection': fields.selection([('customer','Receivable'),
-                                              ('supplier','Payable'),
-                                              ('all','Receivable and Payable')],
-                                              'Filter on Partners', required=True),
         'direction_selection': fields.selection([('past','Past'),
                                                  ('future','Future')],
                                                  'Analysis Direction', required=True),
-        }
-
-    def _get_company(self, cr, uid, context=None):
-        user_obj = self.pool.get('res.users')
-        company_obj = self.pool.get('res.company')
-        if context is None:
-            context = {}
-        user = user_obj.browse(cr, uid, uid, context=context)
-        if user.company_id:
-           return user.company_id.id
-        else:
-           return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
-
+                }
     _defaults = {
-        'company_id': _get_company,
         'period_length': 30,
-        'date1' : time.strftime('%Y-%m-%d'),
-        'result_selection': 'customer',
+        'date_from' : time.strftime('%Y-%m-%d'),
         'direction_selection': 'past',
-                 }
+                }
 
-    def calc_dates(self, cr, uid, ids, context=None):
-        fiscalyear_obj = self.pool.get('account.fiscalyear')
-        data={}
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        mod_obj = self.pool.get('ir.model.data')
+        res = super(account_aged_trial_balance, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
+        doc = etree.XML(res['arch'])
+        nodes = doc.xpath("//field[@name='journal_ids']")
+        for node in nodes:
+            node.set('invisible', '1')
+            node.set('required', '0')
+        res['arch'] = etree.tostring(doc)
+        return res
+
+    def _print_report(self, cr, uid, ids, data, query_line, context=None):
         res = {}
         if context is None:
             context = {}
-        data['ids'] = context.get('active_ids',[])
-        data['model'] = 'res.partner'
-        data['form'] = self.read(cr, uid, ids, [])[0]
-        data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
+
+        data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
+        data['form'].update(self.read(cr, uid, ids, ['period_length', 'direction_selection'])[0])
+
         period_length = data['form']['period_length']
         if period_length<=0:
             raise osv.except_osv(_('UserError'), _('You must enter a period length that cannot be 0 or below !'))
-        start = datetime.date.fromtimestamp(time.mktime(time.strptime(data['form']['date1'],"%Y-%m-%d")))
-        start = DateTime(int(start.year),int(start.month),int(start.day))
+        if not data['form']['date_from']:
+            raise osv.except_osv(_('UserError'), _('Enter a Start date !'))
+
+        start = datetime.date.fromtimestamp(time.mktime(time.strptime(data['form']['date_from'], "%Y-%m-%d")))
+        start = DateTime(int(start.year), int(start.month), int(start.day))
         if data['form']['direction_selection'] == 'past':
             for i in range(5)[::-1]:
                 stop = start - RelativeDateTime(days=period_length)
                 res[str(i)] = {
-                    'name' : str((5-(i+1))*period_length) + '-' + str((5-i)*period_length),
+                    'name' : str((5-(i+1)) * period_length) + '-' + str((5-i) * period_length),
                     'stop': start.strftime('%Y-%m-%d'),
                     'start' : stop.strftime('%Y-%m-%d'),
                     }
@@ -91,18 +84,19 @@ class account_aged_trial_balance(osv.osv_memory):
             for i in range(5):
                 stop = start + RelativeDateTime(days=period_length)
                 res[str(5-(i+1))] = {
-                    'name' : str((i)*period_length)+'-'+str((i+1)*period_length),
+                    'name' : str((i) * period_length)+'-' + str((i+1) * period_length),
                     'start': start.strftime('%Y-%m-%d'),
-                    'stop' : stop.strftime('%Y-%m-%d'),
+                    'stop': stop.strftime('%Y-%m-%d'),
                     }
                 start = stop + RelativeDateTime(days=1)
         data['form'].update(res)
+
         return {
-                'type': 'ir.actions.report.xml',
-                'report_name': 'account.aged_trial_balance',
-                'datas': data,
-            }
+            'type': 'ir.actions.report.xml',
+            'report_name': 'account.aged_trial_balance',
+            'datas': data
+                }
 
 account_aged_trial_balance()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index a928524893e..4db605bdb1b 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -2,31 +2,33 @@
 <openerp>
      <data>
 
-        <record id="account_aged_balance_view" model="ir.ui.view">
-             <field name="name">Aged Partner Balance</field>
-             <field name="model">account.aged.trial.balance</field>
-             <field name="type">form</field>
-             <field name="arch" type="xml">
-				<form string="Print Aged Trial Balance">
-				    <field name="company_id" groups="base.group_multi_company"/>
+     	<record id="account_aged_balance_view" model="ir.ui.view">
+            <field name="name">Aged Partner Balance</field>
+            <field name="model">account.aged.trial.balance</field>
+            <field name="type">form</field>
+            <!--<field name="inherit_id" ref="account_common_report_view" />-->
+            <field name="arch" type="xml">
+            	<form string="Report Options">
+				    <field name="chart_account_id" widget='selection'/>
+				    <field name="fiscalyear_id"/>
 				    <newline/>
-				    <field name="date1"/>
+				    <field name="date_from"/>
 				    <field name="period_length"/>
 				    <newline/>
 				    <field name="result_selection"/>
-				    <newline/>
 				    <field name="direction_selection"/>
+				    <field name="journal_ids"/>
 				    <newline/>
-     				<group colspan="4" col="6">
-                       	<separator colspan="6"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="calc_dates" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+     				<separator colspan="4"/>
+                    <group col="4" colspan="4">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                        <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1"/>
  					</group>
 				</form>
-             </field>
- 		</record>
+            </field>
+        </record>
 
-        <record id="action_account_aged_balance_view" model="ir.actions.act_window">
+ 		<record id="action_account_aged_balance_view" model="ir.actions.act_window">
              <field name="name">Aged Partner Balance</field>
              <field name="res_model">account.aged.trial.balance</field>
              <field name="type">ir.actions.act_window</field>
@@ -35,15 +37,14 @@
              <field name="view_id" ref="account_aged_balance_view"/>
              <field name="context">{'record_id':active_id}</field>
              <field name="target">new</field>
-             <field name="help">Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, Open ERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). Open ERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. </field>
+			<field name="help">Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, Open ERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). Open ERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. </field>
        </record>
 
- 	   <menuitem
- 	   		icon="STOCK_PRINT"
+ 	   <menuitem icon="STOCK_PRINT"
  	   		name="Aged Partner Balance"
  	   		action="action_account_aged_balance_view"
  			id="menu_aged_trial_balance"
- 			parent="next_id_22"/>
+ 			parent="account.next_id_22"/>
 
 	</data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/outlook/__openerp__.py b/addons/outlook/__openerp__.py
index 1ff9b3b310b..b59f158e5e0 100644
--- a/addons/outlook/__openerp__.py
+++ b/addons/outlook/__openerp__.py
@@ -19,46 +19,26 @@
 #
 ##############################################################################
 {
-    "name" : "Accounting and Financial Management",
-    "version" : "1.1",
+    "name" : "Outlook Interface",
+    "version" : "1.0",
     "author" : "OpenERP SA",
-    "category": 'Generic Modules/Accounting',
-    "description": """Financial and accounting module that covers:
-    General accountings
-    Cost / Analytic accounting
-    Third party accounting
-    Taxes management
-    Budgets
-    Customer and Supplier Invoices
-    Bank statements
-    Reconciliation process by partner
-    Creates a dashboards for accountants that includes:
-    * List of uninvoiced quotations
-    * Graph of aged receivables
-    * Graph of aged incomes
+    "website" : "http://www.openerp.com/",
+    "depends" : ["base"],
+    "category" : "Generic Modules/Outlook interface",
+    "description": '''
+      This module provide the Outlook plug-in. 
+
+      Outlook plug-in allows you to select an object that you’d like to add
+      to your email and its attachments from MS Outlook. You can select a partner, a task,
+      a project, an analytical account, or any other object and attach selected
+      mail as .eml file in attachment of selected record.
+
+      ''',
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [],
+    "active": False,
+    "installable": True
 
-The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or
-grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a
-module named account_vouchers
-    """,
-    'website': 'http://www.openerp.com',
-    'init_xml': [],
-    "depends" : ["product", "analytic", "process","board"],
-    'update_xml': [],
-    'demo_xml': [],
-    'test': [
-#        'test/account_customer_invoice.yml',
-#        'test/account_supplier_invoice.yml',
-#        'test/account_change_currency.yml',
-#        'test/chart_of_account.yml',
-#        'test/account_period_close.yml',
-#        'test/account_fiscalyear_close_state.yml',
-#        #'test/account_invoice_state.yml',
-#        'test/account_use_model.yml',
-#        'test/account_validate_account_move.yml',
-#        'test/account_fiscalyear_close.yml',
-    ],
-    'installable': True,
-    'active': False,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_retro_planning/project_retro_planning.py b/addons/project_retro_planning/project_retro_planning.py
index 6360b3cae13..fd50fe64e50 100644
--- a/addons/project_retro_planning/project_retro_planning.py
+++ b/addons/project_retro_planning/project_retro_planning.py
@@ -27,8 +27,10 @@ from osv import fields, osv
 class project_project(osv.osv):
     _inherit = 'project.project'
 
-    def write(self, cr, uid, ids,vals, *args, **kwargs):
-        if 'date' in vals and vals['date']:
+    def write(self, cr, uid, ids, vals, *args, **kwargs):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if vals.get('date', False):
             data_project = self.browse(cr, uid, ids)
             for prj in data_project:
                 new_end_date = date(*time.strptime(vals['date'],'%Y-%m-%d')[:3])
@@ -39,9 +41,9 @@ class project_project(osv.osv):
                             start_dt = (date(*time.strptime(str(task.date_start),'%Y-%m-%d  %H:%M:%S')[:3])+(new_end_date-old_end_date)).strftime('%Y-%m-%d %H:%M:%S')
                             if task.date_deadline:
                                 deadline_dt = (datetime(*time.strptime(str(task.date_deadline),'%Y-%m-%d')[:3])+(new_end_date-old_end_date)).strftime('%Y-%m-%d')
-                                self.pool.get('project.task').write(cr, uid, task.id, {'date_start':start_dt, 'date_deadline':deadline_dt})
+                                self.pool.get('project.task').write(cr, uid, [task.id], {'date_start':start_dt, 'date_deadline':deadline_dt})
                             else:
-                                self.pool.get('project.task').write(cr, uid, task.id, {'date_start':start_dt})
+                                self.pool.get('project.task').write(cr, uid, [task.id], {'date_start':start_dt})
         return super(project_project,self).write(cr, uid, ids, vals, *args, **kwargs)
 
 project_project()
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 423bd090d24..c7b4de7decc 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -57,7 +57,7 @@
     'test': [
              'test/purchase_from_order.yml',
              'test/purchase_from_manual.yml',
-#             'test/purchase_from_picking.yml',
+             'test/purchase_from_picking.yml',
              'purchase_unit_test.xml',
              'test/procurement_buy.yml',
     ],
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index c5b4237a1d8..ddc4f3461da 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -242,7 +242,7 @@
     </para>
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]]</para>
-      <blockTable colWidths="257.0,58.0,61.0,46.0,26.0,74.0" style="Move_Line_Contect_Assign_State">
+      <blockTable colWidths="257.0,58.0,61.0,46.0,26.0,74.0" style="Move_Line_Contect_Assign_State">[[ picking.move_lines or removeParentNode('blockTable')]]
         <tr>
           <td>
             <para style="terp_default_9"><font> [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]  </font> <font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font> </para>
@@ -274,7 +274,7 @@
   </section>    
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') and removeParentNode('section') ]]</para>
-      <blockTable colWidths="257.0,57.0,62.0,46.0,26.0,74.0" style="Move_Line_Content_Other_State">
+      <blockTable colWidths="257.0,57.0,62.0,46.0,26.0,74.0" style="Move_Line_Content_Other_State">[[ picking.move_lines or removeParentNode('blockTable')]]
         <tr>
           <td>
             <para style="terp_default_9"><font> [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]  </font> <font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </font> </para>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c46a9210aad..0f613b5e47d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -112,7 +112,6 @@ class stock_location(osv.osv):
             res[id] = {}.fromkeys(field_names, 0.0)
         if ('product_id' not in context) or not ids:
             return res
-        #location_ids = self.search(cr, uid, [('location_id', 'child_of', ids)])
         for loc in ids:
             context['location'] = [loc]
             prod = self.pool.get('product.product').browse(cr, uid, context['product_id'], context)
@@ -176,7 +175,6 @@ class stock_location(osv.osv):
         'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', multi="stock"),
         'stock_virtual': fields.function(_product_qty_available, method=True, type='float', string='Virtual Stock', multi="stock"),
 
-        #'account_id': fields.many2one('account.account', string='Inventory Account', domain=[('type', '!=', 'view')]),
         'location_id': fields.many2one('stock.location', 'Parent Location', select=True, ondelete='cascade'),
         'child_ids': fields.one2many('stock.location', 'location_id', 'Contains'),
 
@@ -308,7 +306,6 @@ class stock_location(osv.osv):
                     # Choose the right filed standard_price to read
                     amount_unit = product.price_get(pricetype.field, context)[product.id]
                     price = qty[product_id] * amount_unit
-                    # price = qty[product_id] * product.standard_price
 
                     total_price += price
                     result['product'].append({
@@ -360,13 +357,6 @@ class stock_location(osv.osv):
     def _product_virtual_get(self, cr, uid, id, product_ids=False, context=None, states=['done']):
         return self._product_all_get(cr, uid, id, product_ids, context, ['confirmed', 'waiting', 'assigned', 'done'])
 
-    #
-    # TODO:
-    #    Improve this function
-    #
-    # Returns:
-    #    [ (tracking_id, product_qty, location_id) ]
-    #
     def _product_reserve(self, cr, uid, ids, product_id, product_qty, context=None):
         """
         @param product_id: Id of product
@@ -629,13 +619,6 @@ class stock_picking(osv.osv):
         # TODO: Check locations to see if in the same location ?
         return True
 
-#    def button_confirm(self, cr, uid, ids, *args):
-#        for id in ids:
-#            wf_service = netsvc.LocalService("workflow")
-#            wf_service.trg_validate(uid, 'stock.picking', id, 'button_confirm', cr)
-#        self.force_assign(cr, uid, ids, *args)
-#        return True
-
     def action_assign(self, cr, uid, ids, *args):
         """ Changes state of picking to available if all moves are confirmed.
         @return: True
@@ -654,7 +637,6 @@ class stock_picking(osv.osv):
         wf_service = netsvc.LocalService("workflow")
         for pick in self.browse(cr, uid, ids):
             move_ids = [x.id for x in pick.move_lines if x.state in ['confirmed','waiting']]
-#            move_ids = [x.id for x in pick.move_lines]
             self.pool.get('stock.move').force_assign(cr, uid, move_ids)
             wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
         return True
@@ -669,9 +651,6 @@ class stock_picking(osv.osv):
                 raise osv.except_osv(_('Error !'),_('You can not process picking without stock moves'))
             wf_service.trg_validate(uid, 'stock.picking', pick.id,
                 'button_confirm', cr)
-            #move_ids = [x.id for x in pick.move_lines]
-            #self.pool.get('stock.move').force_assign(cr, uid, move_ids)
-            #wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
         return True
 
     def draft_validate(self, cr, uid, ids, *args):
@@ -897,7 +876,7 @@ class stock_picking(osv.osv):
                     'origin': (invoice.origin or '') + ', ' + (picking.name or '') + (picking.origin and (':' + picking.origin) or ''),
                     'comment': (comment and (invoice.comment and invoice.comment+"\n"+comment or comment)) or (invoice.comment and invoice.comment or ''),
                     'date_invoice':context.get('date_inv',False),
-                    'user_id':picking.sale_id.user_id and picking.sale_id.user_id.id or False
+                    'user_id':uid 
                 }
                 invoice_obj.write(cr, uid, [invoice_id], invoice_vals, context=context)
             else:
@@ -914,7 +893,7 @@ class stock_picking(osv.osv):
                     'fiscal_position': partner.property_account_position.id,
                     'date_invoice': context.get('date_inv',False),
                     'company_id': picking.company_id.id,
-                    'user_id':picking.sale_id.user_id and picking.sale_id.user_id.id or False
+                    'user_id':uid
                     }
                 cur_id = self.get_currency_id(cr, uid, picking)
                 if cur_id:
@@ -1377,7 +1356,6 @@ class stock_move(osv.osv):
 
         'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production"),
         'tracking_id': fields.many2one('stock.tracking', 'Pack', select=True, help="This is the code that will be put on the logistical unit: pallet, box, pack."),
-#       'lot_id': fields.many2one('stock.lot', 'Consumer lot', select=True, readonly=True),
 
         'auto_validate': fields.boolean('Auto Validate'),
 
@@ -1576,7 +1554,6 @@ class stock_move(osv.osv):
         """ Confirms stock move.
         @return: List of ids.
         """
-#        ids = map(lambda m: m.id, moves)
         moves = self.browse(cr, uid, ids)
         self.write(cr, uid, ids, {'state': 'confirmed'})
         i = 0
@@ -1692,7 +1669,6 @@ class stock_move(osv.osv):
                         r = res.pop(0)
                         move_id = self.copy(cr, uid, move.id, {'product_qty': r[0], 'location_id': r[1]})
                         done.append(move_id)
-                        #cr.execute('insert into stock_move_history_ids values (%s,%s)', (move.id,move_id))
         if done:
             count += len(done)
             self.write(cr, uid, done, {'state': 'assigned'})
@@ -1745,7 +1721,6 @@ class stock_move(osv.osv):
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)
-        #self.action_cancel(cr,uid, ids2, context)
         return True
 
     def _get_accounting_values(self, cr, uid, move, context=None):
@@ -1789,7 +1764,6 @@ class stock_move(osv.osv):
                 pricetype = price_type_obj.browse(cr,uid,move.company_id.property_valuation_price_type.id)
                 amount_unit = move.product_id.price_get(pricetype.field, context)[move.product_id.id]
                 amount = amount_unit * q or 1.0
-                # amount = q * move.product_id.standard_price
         return journal_id, acc_src, acc_dest, acc_variation, amount
 
     def action_done(self, cr, uid, ids, context=None):
@@ -1816,7 +1790,6 @@ class stock_move(osv.osv):
                         wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr)
                     else:
                         pass
-                        # self.action_done(cr, uid, [move.move_dest_id.id])
                     if move.move_dest_id.auto_validate:
                         self.action_done(cr, uid, [move.move_dest_id.id], context=context)
 
@@ -1857,15 +1830,6 @@ class stock_move(osv.osv):
                         'ref': move.picking_id and move.picking_id.name,
                         })
             
-        # This can be removed
-        #tracking_lot = False
-        #if context:
-        #    tracking_lot = context.get('tracking_lot', False)
-        #    if tracking_lot:
-        #        rec_id = context and context.get('active_id', False)
-        #        tracking = self.pool.get('stock.tracking')
-        #        tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)
-
         self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
@@ -1947,7 +1911,6 @@ class stock_move(osv.osv):
                     'location_dest_id': location_id
                 }
             new_move = self.copy(cr, uid, move.id, default_val)
-            #self.write(cr, uid, [new_move], {'move_history_ids':[(4,move.id)]}) #TODO : to track scrap moves
             res += [new_move]
             product_obj = self.pool.get('product.product')
             for (id, name) in product_obj.name_get(cr, uid, [move.product_id.id]):
@@ -2170,7 +2133,6 @@ class stock_move(osv.osv):
                         'state': 'assigned',
                         'move_dest_id': False,
                         'price_unit': move.price_unit,
-                        #'tracking_id': tracking_lot,
                     })
                 complete.append(self.browse(cr, uid, new_move))
             self.write(cr, uid, move.id,
@@ -2185,7 +2147,6 @@ class stock_move(osv.osv):
                     {
                         'product_qty': move.product_qty,
                         'product_uos_qty': move.product_qty,
-                        #'tracking_id': tracking_lot
                     })
             complete.append(move)
 
@@ -2249,7 +2210,6 @@ class stock_inventory(osv.osv):
             for line in inv.inventory_line_id:
                 pid = line.product_id.id
 
-                # price = line.product_id.standard_price or 0.0
                 amount = self.pool.get('stock.location')._product_get(cr, uid, line.location_id.id, [pid], {'uom': line.product_uom.id})[pid]
                 #TOCHECK: Why put restriction like new inventory qty should greater available qty ?
                 change = line.product_qty - amount
@@ -2348,7 +2308,6 @@ class stock_warehouse(osv.osv):
     _description = "Warehouse"
     _columns = {
         'name': fields.char('Name', size=60, required=True),
-#       'partner_id': fields.many2one('res.partner', 'Owner'),
         'company_id': fields.many2one('res.company','Company',required=True,select=1),
         'partner_address_id': fields.many2one('res.partner.address', 'Owner Address'),
         'lot_input_id': fields.many2one('stock.location', 'Location Input', required=True, domain=[('usage','<>','view')]),
@@ -2385,7 +2344,6 @@ class stock_picking_move_wizard(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Name', size=64, invisible=True),
-        #'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines',readonly=True),
         'move_ids': fields.many2many('stock.move', 'picking_move_wizard_rel', 'picking_move_wizard_id', 'move_id', 'Entry lines', required=True),
         'address_id': fields.many2one('res.partner.address', 'Dest. Address', invisible=True),
         'picking_id': fields.many2one('stock.picking', 'Picking list', select=True, invisible=True),