diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml
index 6cb381531c9..bd4129fd067 100644
--- a/addons/account/project/report/analytic_journal.rml
+++ b/addons/account/project/report/analytic_journal.rml
@@ -119,7 +119,7 @@
     <blockTable colWidths="539.0" style="Table_Tilte">
       <tr>
         <td>
-          <para style="terp_header_Centre">Analitic Journal - [[ company.currency_id.name ]]</para>
+          <para style="terp_header_Centre">Analytic Journal - [[ company.currency_id.name ]]</para>
         </td>
       </tr>
       <tr>
@@ -203,10 +203,10 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_9">[[ move.name ]]</para>
+            <para style="terp_default_9">[[ move.name ]] KI</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ move.account_id.code ]] - [[ move.account_id.name ]]</para>
+            <para style="terp_default_9">[[ move.account_id.code ]] [[ move.account_id.name ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(move.debit-move.credit) ]]</para>
@@ -226,13 +226,13 @@
         <blockTable colWidths="85.0,62.0,168.0,73.0,74.0,77.0" style="Table4">
           <tr>
             <td>
-              <para style="terp_default_9">[[ move_a or removeParentNode('blockTable') ]] [[ formatLang(move_a.date,date = True) ]]</para>
+              <para style="terp_default_9">[[ (not move_a) and removeParentNode('blockTable') ]] [[ formatLang(move_a.date,date = True) ]]</para>
             </td>
             <td>
               <para style="terp_default_9">[[ move_a.code ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ move_a.name ]]</para>
+              <para style="terp_default_9">[[ move_a.name ]] asgfas</para>
             </td>
             <td>
               <para style="terp_default_9">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para>
@@ -266,7 +266,7 @@
       <blockTable colWidths="85.0,62.0,168.0,73.0,74.0,77.0" style="Table3">
         <tr>
           <td>
-            <para style="terp_default_9">[[ move_a or removeParentNode('blockTable') ]] [[ formatLang(move_a.date,date = True) ]]</para>
+            <para style="terp_default_9">[[ (not move_a) and removeParentNode('blockTable') ]] [[ formatLang(move_a.date,date = True) ]]</para>
           </td>
           <td>
             <para style="terp_default_9">[[ move_a.code ]]</para>
diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml
index 18511393253..5761fc122c6 100644
--- a/addons/account/project/report/inverted_analytic_balance.rml
+++ b/addons/account/project/report/inverted_analytic_balance.rml
@@ -157,7 +157,7 @@
       <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table3">
         <tr>
           <td>
-            <para style="terp_default_Bold_9">[[ move_g or removeParentNode('blockTable') ]] [[ move_g['code'] ]]</para>
+            <para style="terp_default_Bold_9">[[ (not move_g) and removeParentNode('blockTable') ]] [[ move_g['code'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
@@ -184,7 +184,7 @@
         <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table4">
           <tr>
             <td>
-              <para style="terp_default_9">[[ move_a or removeParentNode('blockTable') ]] [[ move_a['code'] ]]</para>
+              <para style="terp_default_9">[[ (not move_a) and removeParentNode('blockTable') ]] [[ move_a['code'] ]]</para>
             </td>
             <td>
               <para style="terp_default_9">[[ move_a['complete_name'] ]]</para>
diff --git a/addons/account_balance/report/__init__.py b/addons/account_balance/report/__init__.py
index c25f02541b2..1c3fde239be 100644
--- a/addons/account_balance/report/__init__.py
+++ b/addons/account_balance/report/__init__.py
@@ -20,5 +20,6 @@
 #
 ##############################################################################
 import account_balance
+import account_balance_landscape
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_balance/report/account_balance.py b/addons/account_balance/report/account_balance.py
index 4415d2d9dcc..0f0e92d9ad1 100644
--- a/addons/account_balance/report/account_balance.py
+++ b/addons/account_balance/report/account_balance.py
@@ -37,6 +37,8 @@ class account_balance(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(account_balance, self).__init__(cr, uid, name, context)
         self.flag=1
+        self.dr_total= 0.00
+        self.cr_total= 0.00
         self.parent_bal=0
         self.status=0
         self.done_total=0
@@ -47,268 +49,278 @@ class account_balance(report_sxw.rml_parse):
         self.localcontext.update({
             'time': time,
             'lines': self.lines,
+            'get_lines':self.get_lines,
             'linesForTotal': self.linesForTotal,
             'linesForYear': self.linesForYear,
+            'get_years':self.get_years,
+            'cal_total':self.cal_total,
+            'total_dr':self.total_dr,
+            'total_cr':self.total_cr
             })
         self.context = context
 
-    def repeatIn(self, lst, name, nodes_parent=False,td=False,width=[],value=[],type=[]):
-        self._node.data = ''
-        node = self._find_parent(self._node, nodes_parent or parents)
-        ns = node.nextSibling
-#start
-        if value==['Cash','%']:
-            if show==1:
-                if perc==1:
-                    if pattern=='none':
-                        value=['','Cash','%']
-                        type=['lable','lable','lable']
-                        width=[130,65,65]
-                    else:
-                        value=[' ','','Cash','%']
-                        type=['string','lable','lable','lable']
-                        width=[65,130,65,65]
-                else:
-                    if pattern=='none':
-                        value=['']
-                        type=['lable']
-                        width=[195]
-                    else:
-                        value=[' ','']
-                        type=['string','lable']
-                        width=[65,195]
-            else:
-                if perc==1:
-                    if pattern=='none':
-                        value=['Cash','%']
-                        type=['lable','lable']
-                        width=[65,65]
-                    else:
-                        value=[' ','Cash','%']
-                        type=['string','lable','lable']
-                        width=[65,65,65]
-                else:
-                    if pattern=='none':
-                        value=['']
-                        type=['lable']
-                        width=[65]
-                    else:
-                        value=[' ','']
-                        type=['string','lable']
-                        width=[65,65]
-
-
-        if value==['year']:
-            if show==1:
-                if perc==1:
-                    if pattern=='none':
-                        width=[260]
-                    else:
-                        value=[' ','year']
-                        type=['string','string']
-                        width=[65,260]
-                else:
-                    if pattern=='none':
-                        width=[195]
-                    else:
-                        value=[' ','year']
-                        type=['string','string']
-                        width=[65,195]
-            else:
-                if perc==1:
-                    if pattern=='none':
-                        width=[130]
-                    else:
-                        value=[' ','year']
-                        type=['string','string']
-                        width=[65,130]
-
-                else:
-                    if pattern=='none':
-                        width=[65]
-                    else:
-                        value=[' ','year']
-                        type=['string','string']
-                        width=[65,65]
-
-        if value==['Debit','Credit','Balance']:
-            if show==1:
-                if perc==1:
-                    if pattern=='none':
-                        width=[65,65,130]
-                    else:
-                        value=[' ','Debit','Credit','Balance']
-                        type=['string','lable','lable','lable']
-                        width=[65,65,65,130]
-                else:
-                    if pattern=='none':
-                        width=[65,65,65]
-                    else:
-                        value=[' ','Debit','Credit','Balance']
-                        type=['string','lable','lable','lable']
-                        width=[65,65,65,65]
-
-            else:
-                if perc==1:
-                    if pattern=='none':
-                        value=['Balance']
-                        type=['lable']
-                        width=[130]
-                    else:
-                        value=[' ','Balance']
-                        type=['string','lable']
-                        width=[65,130]
-                else:
-                    if pattern=='none':
-                        value=['Balance']
-                        type=['lable']
-                        width=[65]
-                    else:
-                        value=[' ','Balance']
-                        type=['string','lable']
-                        width=[65,65]
-
-        if value==['debit','credit','balance']:
-            if show==1:
-                if perc==1:
-                    if pattern=='none':
-                        value=['debit','credit','balance','balance_perc']
-                        type=['string','string','string','string']
-                        width=[65,65,65,65]
-                    else:
-                        value=[pattern,'debit','credit','balance','balance_perc']
-                        type=['string','string','string','string','string']
-                        width=[65,65,65,65,65]
-                else:
-                    if pattern=='none':
-                        value=['debit','credit','balance']
-                        type=['string','string','string']
-                        width=[65,65,65]
-                    else:
-                        value=[pattern,'debit','credit','balance']
-                        type=['string','string','string','string']
-                        width=[65,65,65,65]
-
-            else:
-                if perc==1:
-                    if pattern=='none':
-                        value=['balance','balance_perc']
-                        type=['string','string']
-                        width=[65,65]
-                    else:
-                        value=[pattern,'balance','balance_perc']
-                        type=['string','string','string']
-                        width=[65,65,65]
-                else:
-                    if pattern=='none':
-                        value=['balance']
-                        type=['string']
-                        width=[65]
-                    else:
-                        value=[pattern,'balance']
-                        type=['string','string']
-                        width=[65,65]
-
-        if value==['sum_debit','sum_credit','']:
-            if show==1:
-                if perc==1:
-                    if pattern=='none':
-                        width=[65,65,130]
-                    else:
-                        value=[' ','sum_debit','sum_credit','']
-                        type=['string','string','string','lable']
-                        width=[65,65,65,130]
-                else:
-                    if pattern=='none':
-                        width=[65,65,65]
-                    else:
-                        value=[' ','sum_debit','sum_credit','']
-                        type=['string','string','string','lable']
-                        width=[65,65,65,65]
-            else:
-                if perc==1:
-                    if pattern=='none':
-                        value=['']
-                        type=['lable']
-                        width=[130]
-                    else:
-                        value=[' ','']
-                        type=['string','lable']
-                        width=[65,130]
-                else:
-                    if pattern=='none':
-                        value=['']
-                        type=['lable']
-                        width=[65]
-                    else:
-                        value=[' ','']
-                        type=['string','lable']
-                        width=[65,65]
-
-        if not lst:
-            lst.append(1)
-        for ns in node.childNodes :
-            if ns and ns.nodeName!='#text' and ns.tagName=='blockTable' and td :
-                width_str = ns._attrs['colWidths'].nodeValue
-                ns.removeAttribute('colWidths')
-                total_td = td * len(value)
-
-                if not width:
-                    for v in value:
-                        width.append(30)
-                check1=0
-                for t in range(td):
-                    for v in range(len(value)):
-                        if type[v] in ('String','STRING','string'):
-                            if (value[v]==" " or value[0]==pattern):
-                                if check1==0:
-                                    check1=1
-                                    width_str +=',0.0'
-                                else:
-                                    width_str +=',%d'%width[v]
-                            else:
-                                width_str +=',%d'%width[v]
-                        else:
-                            width_str +=',%d'%width[v]
-                ns.setAttribute('colWidths',width_str)
-
-                child_list =  ns.childNodes
-
-                check=0
-                for child in child_list:
-                    if child.nodeName=='tr':
-                        lc = child.childNodes[1]
-                        for t in range(td):
-                            i=0
-                            for v in value:
-
-                                newnode = lc.cloneNode(1)
-                                temp2="%s['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]]"%(name)
+#    def repeatIn(self, lst, name, nodes_parent=False,td=False,width=[],value=[],type=[]):
+#        self._node.data = ''
+#        node = self._find_parent(self._node, nodes_parent or parents)
+#        ns = node.nextSibling
+##start
+#        if value==['Cash','%']:
+#            if show==1:
+#                if perc==1:
+#                    if pattern=='none':
+#                        value=['','Cash','%']
+#                        type=['lable','lable','lable']
+#                        width=[130,65,65]
+#                    else:
+#                        value=[' ','','Cash','%']
+#                        type=['string','lable','lable','lable']
+#                        width=[65,130,65,65]
+#                else:
+#                    if pattern=='none':
+#                        value=['']
+#                        type=['lable']
+#                        width=[195]
+#                    else:
+#                        value=[' ','']
+#                        type=['string','lable']
+#                        width=[65,195]
+#            else:
+#                if perc==1:
+#                    if pattern=='none':
+#                        value=['Cash','%']
+#                        type=['lable','lable']
+#                        width=[65,65]
+#                    else:
+#                        value=[' ','Cash','%']
+#                        type=['string','lable','lable']
+#                        width=[65,65,65]
+#                else:
+#                    if pattern=='none':
+#                        value=['']
+#                        type=['lable']
+#                        width=[65]
+#                    else:
+#                        value=[' ','']
+#                        type=['string','lable']
+#                        width=[65,65]
 #
-                                if type[i] in ('String','STRING','string'):
-                                    if (v==" " or v==pattern) and i==0 and check==0:
-                                        check=1
-                                        newnode.childNodes[1].lastChild.data=""
-                                    else:
-                                        if v==" ":
-                                            newnode.childNodes[1].lastChild.data=""
-                                        else:
-                                            t1= "[[ %s['%s%d'] ]]"%(name,v,t)
-                                            if v=="year" or v=="sum_debit" or v=="sum_credit":
-                                                newnode.childNodes[1].lastChild.data = t1
-                                            else:
-                                                newnode.childNodes[1].lastChild.data = t1+"[["+temp2
-#                                   newnode.childNodes[1].lastChild.data=[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]]
-                                elif type[i] in ('Lable','LABLE','lable'):
-
-                                    newnode.childNodes[1].lastChild.data= v
-
-                                child.appendChild(newnode)
-
-                                newnode=False
-                                i+=1
-        return super(account_balance,self).repeatIn(lst, name, nodes_parent=False)
+#
+#        if value==['year']:
+#            if show==1:
+#                if perc==1:
+#                    if pattern=='none':
+#                        width=[260]
+#                    else:
+#                        value=[' ','year']
+#                        type=['string','string']
+#                        width=[65,260]
+#                else:
+#                    if pattern=='none':
+#                        width=[195]
+#                    else:
+#                        value=[' ','year']
+#                        type=['string','string']
+#                        width=[65,195]
+#            else:
+#                if perc==1:
+#                    if pattern=='none':
+#                        width=[130]
+#                    else:
+#                        value=[' ','year']
+#                        type=['string','string']
+#                        width=[65,130]
+#
+#                else:
+#                    if pattern=='none':
+#                        width=[65]
+#                    else:
+#                        value=[' ','year']
+#                        type=['string','string']
+#                        width=[65,65]
+#
+#        if value==['Debit','Credit','Balance']:
+#            if show==1:
+#                if perc==1:
+#                    if pattern=='none':
+#                        width=[65,65,130]
+#                    else:
+#                        value=[' ','Debit','Credit','Balance']
+#                        type=['string','lable','lable','lable']
+#                        width=[65,65,65,130]
+#                else:
+#                    if pattern=='none':
+#                        width=[65,65,65]
+#                    else:
+#                        value=[' ','Debit','Credit','Balance']
+#                        type=['string','lable','lable','lable']
+#                        width=[65,65,65,65]
+#
+#            else:
+#                if perc==1:
+#                    if pattern=='none':
+#                        value=['Balance']
+#                        type=['lable']
+#                        width=[130]
+#                    else:
+#                        value=[' ','Balance']
+#                        type=['string','lable']
+#                        width=[65,130]
+#                else:
+#                    if pattern=='none':
+#                        value=['Balance']
+#                        type=['lable']
+#                        width=[65]
+#                    else:
+#                        value=[' ','Balance']
+#                        type=['string','lable']
+#                        width=[65,65]
+#
+#        if value==['debit','credit','balance']:
+#            if show==1:
+#                if perc==1:
+#                    if pattern=='none':
+#                        value=['debit','credit','balance','balance_perc']
+#                        type=['string','string','string','string']
+#                        width=[65,65,65,65]
+#                    else:
+#                        value=[pattern,'debit','credit','balance','balance_perc']
+#                        type=['string','string','string','string','string']
+#                        width=[65,65,65,65,65]
+#                else:
+#                    if pattern=='none':
+#                        value=['debit','credit','balance']
+#                        type=['string','string','string']
+#                        width=[65,65,65]
+#                    else:
+#                        value=[pattern,'debit','credit','balance']
+#                        type=['string','string','string','string']
+#                        width=[65,65,65,65]
+#
+#            else:
+#                if perc==1:
+#                    if pattern=='none':
+#                        value=['balance','balance_perc']
+#                        type=['string','string']
+#                        width=[65,65]
+#                    else:
+#                        value=[pattern,'balance','balance_perc']
+#                        type=['string','string','string']
+#                        width=[65,65,65]
+#                else:
+#                    if pattern=='none':
+#                        value=['balance']
+#                        type=['string']
+#                        width=[65]
+#                    else:
+#                        value=[pattern,'balance']
+#                        type=['string','string']
+#                        width=[65,65]
+#
+#        if value==['sum_debit','sum_credit','']:
+#            if show==1:
+#                if perc==1:
+#                    if pattern=='none':
+#                        width=[65,65,130]
+#                    else:
+#                        value=[' ','sum_debit','sum_credit','']
+#                        type=['string','string','string','lable']
+#                        width=[65,65,65,130]
+#                else:
+#                    if pattern=='none':
+#                        width=[65,65,65]
+#                    else:
+#                        value=[' ','sum_debit','sum_credit','']
+#                        type=['string','string','string','lable']
+#                        width=[65,65,65,65]
+#            else:
+#                if perc==1:
+#                    if pattern=='none':
+#                        value=['']
+#                        type=['lable']
+#                        width=[130]
+#                    else:
+#                        value=[' ','']
+#                        type=['string','lable']
+#                        width=[65,130]
+#                else:
+#                    if pattern=='none':
+#                        value=['']
+#                        type=['lable']
+#                        width=[65]
+#                    else:
+#                        value=[' ','']
+#                        type=['string','lable']
+#                        width=[65,65]
+#
+#        if not lst:
+#            lst.append(1)
+#        for ns in node.childNodes :
+#            if ns and ns.nodeName!='#text' and ns.tagName=='blockTable' and td :
+#                width_str = ns._attrs['colWidths'].nodeValue
+#                ns.removeAttribute('colWidths')
+#                total_td = td * len(value)
+#
+#                if not width:
+#                    for v in value:
+#                        width.append(30)
+#                check1=0
+#                for t in range(td):
+#                    for v in range(len(value)):
+#                        if type[v] in ('String','STRING','string'):
+#                            if (value[v]==" " or value[0]==pattern):
+#                                if check1==0:
+#                                    check1=1
+#                                    width_str +=',0.0'
+#                                else:
+#                                    width_str +=',%d'%width[v]
+#                            else:
+#                                width_str +=',%d'%width[v]
+#                        else:
+#                            width_str +=',%d'%width[v]
+#                ns.setAttribute('colWidths',width_str)
+#
+#                child_list =  ns.childNodes
+#
+#                check=0
+#                for child in child_list:
+#                    if child.nodeName=='tr':
+#                        lc = child.childNodes[1]
+#                        for t in range(td):
+#                            i=0
+#                            for v in value:
+#
+#                                newnode = lc.cloneNode(1)
+#                                temp2="%s['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]]"%(name)
+##
+#                                if type[i] in ('String','STRING','string'):
+#                                    if (v==" " or v==pattern) and i==0 and check==0:
+#                                        check=1
+#                                        if newnode.childNodes[1].lastChild:
+#                                            newnode.childNodes[1].lastChild.data=""
+#                                    else:
+#                                        if v==" ":
+#                                            if newnode.childNodes[1].lastChild:
+#                                                newnode.childNodes[1].lastChild.data=""
+#                                        else:
+#                                            t1= "[[ %s['%s%d'] ]]"%(name,v,t)
+#                                            if v=="year" or v=="sum_debit" or v=="sum_credit":
+#                                                if newnode.childNodes[1].lastChild:
+#                                                    newnode.childNodes[1].lastChild.data = t1
+#                                            else:
+#                                                if newnode.childNodes[1].lastChild:
+#                                                    newnode.childNodes[1].lastChild.data = t1+"[["+temp2
+##                                   newnode.childNodes[1].lastChild.data=[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]]
+#                                elif type[i] in ('Lable','LABLE','lable'):
+#                                    if newnode.childNodes[1].lastChild:
+#                                        newnode.childNodes[1].lastChild.data= v
+#
+#                                child.appendChild(newnode)
+#
+#                                newnode=False
+#                                i+=1
+#        return super(account_balance,self).repeatIn(lst, name, nodes_parent=False)
 #end
+    
     def linesForYear(self,form):
         temp=0
         years={}
@@ -381,7 +393,6 @@ class account_balance(report_sxw.rml_parse):
             ids = self.ids
         if not ids:
             return []
-
         ctx = self.context.copy()
         result_total_parent=[]
 
@@ -401,22 +412,20 @@ class account_balance(report_sxw.rml_parse):
         if level==1:
             doneAccount={}
         for entry in merged_accounts:
-
+            
             if entry[0].id in doneAccount:
                 continue
             doneAccount[entry[0].id] = 1
-
             for k in range(0,len(entry)):
                 temp_credit=0.00
                 temp_debit=0.00
-
-                temp_credit+=entry[k].credit
-                temp_debit+=entry[k].debit
+                if entry[0].type <> 'view':
+                    temp_credit+=entry[k].credit
+                    temp_debit+=entry[k].debit
 
                 if self.flag==1:
                     self.result_total["sum_credit" + str(k)]=0.00
                     self.result_total["sum_debit" + str(k)]=0.00
-
                 if form['account_choice']=='bal_zero':
                     if temp_credit<>temp_debit:
                         self.result_total["sum_credit" + str(k)]+=temp_credit
@@ -533,7 +542,6 @@ class account_balance(report_sxw.rml_parse):
 
                         res["bal_perc"+str(j)]=locale.format("%.2f", temp_perc) + "%"
 
-
                     if ref_bal=='nothing':
                         if level==1:
                             self.parent_bal=1
@@ -586,7 +594,69 @@ class account_balance(report_sxw.rml_parse):
 
         return result
 
+    def get_years(self,form):
+        result =[]
+        res={}
+        for temp in range(0,len(form['fiscalyear'][0][2])):
+            res={}
+            fy=self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'][0][2][temp])
+            res['year']=fy[0][1]
+            res['last_str']=temp
+            
+            result.append(res)
+        self.linesForYear(form)
+        return result
+    
+    def get_lines(self,year_dict,form):
+        final_result = []
+        line_l =[]
+        res = {}         
+        line_l = self.lines(form)
+        self.cal_total(year_dict)
+        if line_l:
+            for l in line_l:
+                res = {}
+                res['code'] = l['code']
+                res['name'] = l['name']
+                res['level'] = l['level']
+                for k,v in l.items():
+                    if k.startswith('debit'+str(year_dict['last_str'])):
+                     res['debit'] = v  
+                    if k.startswith('credit'+str(year_dict['last_str'])):
+                     res['credit'] = v
+                    if k.startswith('balance'+str(year_dict['last_str'])) and not k.startswith('balance_perc'+str(year_dict['last_str'])):
+                     res['balance'] =v 
+                    if k.startswith('balance_perc'+str(year_dict['last_str'])) and not k.startswith('balance'+str(year_dict['last_str'])):
+                     res['balance_perc'] = v
+                    if form['compare_pattern'] == 'bal_perc':
+                        if k.startswith('bal_perc'+str(year_dict['last_str'])):
+                         res['pattern'] = v
+                    elif form['compare_pattern'] == 'bal_cash':
+                        if k.startswith('bal_cash'+str(year_dict['last_str'])):
+                         res['pattern'] = v
+                    else:
+                         res['pattern'] = ''
+                final_result.append(res)
+        return final_result
+
+    def cal_total(self,year_dict):
+        total_l = self.result_total
+        if total_l:
+            for k,v in total_l.items():
+                if k.startswith('sum_debit'+str(year_dict['last_str'])):
+                    self.dr_total = v
+                elif k.startswith('sum_credit'+str(year_dict['last_str'])):
+                    self.cr_total = v
+                else:
+                    continue
+        return True
+    
+    def total_dr(self):
+        return self.dr_total
+    
+    def total_cr(self):
+        return self.cr_total
+    
 report_sxw.report_sxw('report.account.balance.account.balance', 'account.account', 'addons/account_balance/report/account_balance.rml', parser=account_balance, header=False)
-report_sxw.report_sxw('report.account.account.balance.landscape', 'account.account', 'addons/account_balance/report/account_balance_landscape.rml', parser=account_balance, header=False)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_balance/report/account_balance.rml b/addons/account_balance/report/account_balance.rml
index c8ccaa1e139..ac17ea930a8 100644
--- a/addons/account_balance/report/account_balance.rml
+++ b/addons/account_balance/report/account_balance.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(635.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="15.0" y1="15.0" width="615" height="772"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,170 +10,313 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table_Tiltle">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_header_account">
+      <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <blockBackground colorName="#b3b3b3" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#b3b3b3" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#b3b3b3" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#b3b3b3" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#b3b3b3" start="4,0" stop="4,-1"/>
+      <blockBackground colorName="#b3b3b3" start="5,0" stop="5,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
-      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
-      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table61">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="red"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <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"/>
+      <blockBackground colorName="#b3b3b3" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#b3b3b3" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#b3b3b3" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#b3b3b3" start="3,0" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Times-Roman" fontSize="12.0" leading="18" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0"/>
-    <paraStyle name="P3" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" />
-    <paraStyle name="P4" fontName="Times-Roman" fontSize="9.0" alignment="CENTER"/>
-    <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="9.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P8" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="P9" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" rightIndent="17.0" leftIndent="-0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="1.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
     <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="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <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="0.0" spaceAfter="0.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="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.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="0.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_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
+  <images/>
   <story>
-    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table1">
+    <para style="terp_default_8">[[ repeatIn(get_years(data['form']), 'y') ]]</para>
+    <blockTable colWidths="482.0" style="Table_Tiltle">
       <tr>
         <td>
-          <para style="Table Contents">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P1">Account balance</para>
-        </td>
-        <td>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="Table Contents">[[ company.name ]]</para>
-        </td>
-        <td>
-          <para style="P4">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P5">Currency: [[ company.currency_id.name ]]</para>
+          <para style="terp_header_Centre">Account Balance - [[ company.currency_id.name ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="Standard">
+    <para style="terp_default_space">
       <font color="white"> </font>
     </para>
-    <para style="P8">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
-     <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P13"> [[repeatIn(linesForYear(data['form']),'year_header',td=len(data['form']['fiscalyear'][0][2]),width=[126],value=['year'],type=['string']) ]]</para>
-      <blockTable colWidths="190.0" style="Table6">
-		 <tr>
-          <td>
-            <para style="P1">Account Information</para>
-          </td>
-         </tr>
-      </blockTable>
-    </section>
-    <section>
-      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['Debit','Credit','Balance'],type=['lable','lable','lable']) ]]</para>
-      <blockTable colWidths="30.0,160.0" style="Table6">
-        <tr>
-          <td>
-            <para style="P1">Code</para>
-          </td>
-          <td>
-            <para style="P1">Account Name</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <section>
-      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[84,42],value=['Cash','%'],type=['lable','lable']) ]]</para>
-      <blockTable colWidths="190.0" style="Table5">
-        <tr>
-          <td>
-            <para style="P4"> </para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P13">[[ repeatIn(lines(data['form']),'a',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['debit','credit','balance'],type=['string','string','string']) ]]</para>
-      <blockTable colWidths="0.0,28.0,162.0" style="Table5">
-        <tr>
+    <para style="terp_header">Year : [[ y['year'] ]]</para>
+    <blockTable colWidths="57.0,134.0,51.0,62.0,67.0,111.0" style="Table_header_account">
+      <tr>
         <td>
-            <para style="P3"> </para>
-          </td>
-          <td>
-            <para style="P7">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['code'] ]]</para>
-          </td>
-          <td>
-          <para style="P2"><font>[['.....'*(a['level']-1) ]][[ setTag('font','font',{'color':'white'}) ]]</font><font>[[ a['status']==1 and ( setTag('font','font',{'name':'Times-bold'})) ]][[ a['name'] ]]</font></para>
-         </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="P8">
+          <para style="terp_tblheader_Details">[[ data['form']['show_columns'] and 'Code' or removeParentNode('blockTable') ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Account Name </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details"><font>[[ data['form']['compare_pattern']!='none' and "C.S.Y.T.(C./P)" or removeParentNode('font') ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="56.0,134.0,50.0,240.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">[[ data['form']['show_columns'] and removeParentNode('blockTable') or 'Code' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Account Name </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details"><font>[[ data['form']['compare_pattern']!='none' and "C.S.Y.T.(C./P)" or removeParentNode('font') ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_2">
       <font color="white"> </font>
     </para>
     <section>
-     <para style="P13">[[ repeatIn(linesForTotal(data['form']),'total',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['sum_debit','sum_credit',''],type=['string','string','lable'] ) ]]</para>
-      <blockTable colWidths="190.0" style="Table6">
+      <para style="terp_default_8">[[ repeatIn(get_lines(y,data['form']), 'a') ]]</para>
+      <blockTable colWidths="56.0,134.0,51.0,61.0,69.0,110.0" style="Table4">
         <tr>
           <td>
-            <para style="P3">Total:[[ data['form']['show_columns']==0 and removeParentNode('section')]]</para>
+            <para style="terp_default_9">[[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['pattern'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['debit'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['credit'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
           </td>
         </tr>
       </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="56.0,134.0,52.0,61.0,69.0,74.0,36.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['pattern'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['debit'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['credit'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['balance_perc'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2"/>
+      <blockTable colWidths="55.0,135.0,113.0,178.0" style="Table6">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['pattern'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="54.0,135.0,113.0,130.0,49.0" style="Table5">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['pattern'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['balance_perc'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
     </section>
-
-    <para style="Standard">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
+    <blockTable colWidths="52.0,189.0,61.0,69.0,110.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ not data['form']['show_columns'] and removeParentNode('blockTable') ]] </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Total :</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ total_dr() ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ total_cr() ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and "C.S.Y.T.(C./P) : Compare Selected Years In Terms of Cash/Perc" or removeParentNode('font') ]]</para>
   </story>
 </document>
diff --git a/addons/account_balance/report/account_balance_landscape.py b/addons/account_balance/report/account_balance_landscape.py
new file mode 100644
index 00000000000..2638a628990
--- /dev/null
+++ b/addons/account_balance/report/account_balance_landscape.py
@@ -0,0 +1,666 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+import locale
+from report import report_sxw
+import rml_parse
+
+#from addons.account.wizard import wizard_account_balance_report
+
+parents = {
+    'tr':1,
+    'li':1,
+    'story': 0,
+    'section': 0
+}
+
+class account_balance_landscape(rml_parse.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(account_balance_landscape, self).__init__(cr, uid, name, context)
+        self.flag=1
+        self.dr_total= 0.00
+        self.cr_total= 0.00
+        self.parent_bal=0
+        self.status=0
+        self.done_total=0
+        self.baldiv={}
+        self.empty_parent=0
+        self.result_total = {}
+        self.total_for_perc=[]
+        self.localcontext.update({
+            'time': time,
+            'lines': self.lines,
+            'get_lines':self.get_lines,
+            'linesForTotal': self.linesForTotal,
+            'linesForYear': self.linesForYear,
+            'get_years':self.get_years,
+            'cal_total':self.cal_total,
+            'total_dr':self.total_dr,
+            'total_cr':self.total_cr
+            })
+        self.context = context
+
+#    def repeatIn(self, lst, name, nodes_parent=False,td=False,width=[],value=[],type=[]):
+#        self._node.data = ''
+#        node = self._find_parent(self._node, nodes_parent or parents)
+#        ns = node.nextSibling
+##start
+#        if value==['Cash','%']:
+#            if show==1:
+#                if perc==1:
+#                    if pattern=='none':
+#                        value=['','Cash','%']
+#                        type=['lable','lable','lable']
+#                        width=[130,65,65]
+#                    else:
+#                        value=[' ','','Cash','%']
+#                        type=['string','lable','lable','lable']
+#                        width=[65,130,65,65]
+#                else:
+#                    if pattern=='none':
+#                        value=['']
+#                        type=['lable']
+#                        width=[195]
+#                    else:
+#                        value=[' ','']
+#                        type=['string','lable']
+#                        width=[65,195]
+#            else:
+#                if perc==1:
+#                    if pattern=='none':
+#                        value=['Cash','%']
+#                        type=['lable','lable']
+#                        width=[65,65]
+#                    else:
+#                        value=[' ','Cash','%']
+#                        type=['string','lable','lable']
+#                        width=[65,65,65]
+#                else:
+#                    if pattern=='none':
+#                        value=['']
+#                        type=['lable']
+#                        width=[65]
+#                    else:
+#                        value=[' ','']
+#                        type=['string','lable']
+#                        width=[65,65]
+#
+#
+#        if value==['year']:
+#            if show==1:
+#                if perc==1:
+#                    if pattern=='none':
+#                        width=[260]
+#                    else:
+#                        value=[' ','year']
+#                        type=['string','string']
+#                        width=[65,260]
+#                else:
+#                    if pattern=='none':
+#                        width=[195]
+#                    else:
+#                        value=[' ','year']
+#                        type=['string','string']
+#                        width=[65,195]
+#            else:
+#                if perc==1:
+#                    if pattern=='none':
+#                        width=[130]
+#                    else:
+#                        value=[' ','year']
+#                        type=['string','string']
+#                        width=[65,130]
+#
+#                else:
+#                    if pattern=='none':
+#                        width=[65]
+#                    else:
+#                        value=[' ','year']
+#                        type=['string','string']
+#                        width=[65,65]
+#
+#        if value==['Debit','Credit','Balance']:
+#            if show==1:
+#                if perc==1:
+#                    if pattern=='none':
+#                        width=[65,65,130]
+#                    else:
+#                        value=[' ','Debit','Credit','Balance']
+#                        type=['string','lable','lable','lable']
+#                        width=[65,65,65,130]
+#                else:
+#                    if pattern=='none':
+#                        width=[65,65,65]
+#                    else:
+#                        value=[' ','Debit','Credit','Balance']
+#                        type=['string','lable','lable','lable']
+#                        width=[65,65,65,65]
+#
+#            else:
+#                if perc==1:
+#                    if pattern=='none':
+#                        value=['Balance']
+#                        type=['lable']
+#                        width=[130]
+#                    else:
+#                        value=[' ','Balance']
+#                        type=['string','lable']
+#                        width=[65,130]
+#                else:
+#                    if pattern=='none':
+#                        value=['Balance']
+#                        type=['lable']
+#                        width=[65]
+#                    else:
+#                        value=[' ','Balance']
+#                        type=['string','lable']
+#                        width=[65,65]
+#
+#        if value==['debit','credit','balance']:
+#            if show==1:
+#                if perc==1:
+#                    if pattern=='none':
+#                        value=['debit','credit','balance','balance_perc']
+#                        type=['string','string','string','string']
+#                        width=[65,65,65,65]
+#                    else:
+#                        value=[pattern,'debit','credit','balance','balance_perc']
+#                        type=['string','string','string','string','string']
+#                        width=[65,65,65,65,65]
+#                else:
+#                    if pattern=='none':
+#                        value=['debit','credit','balance']
+#                        type=['string','string','string']
+#                        width=[65,65,65]
+#                    else:
+#                        value=[pattern,'debit','credit','balance']
+#                        type=['string','string','string','string']
+#                        width=[65,65,65,65]
+#
+#            else:
+#                if perc==1:
+#                    if pattern=='none':
+#                        value=['balance','balance_perc']
+#                        type=['string','string']
+#                        width=[65,65]
+#                    else:
+#                        value=[pattern,'balance','balance_perc']
+#                        type=['string','string','string']
+#                        width=[65,65,65]
+#                else:
+#                    if pattern=='none':
+#                        value=['balance']
+#                        type=['string']
+#                        width=[65]
+#                    else:
+#                        value=[pattern,'balance']
+#                        type=['string','string']
+#                        width=[65,65]
+#
+#        if value==['sum_debit','sum_credit','']:
+#            if show==1:
+#                if perc==1:
+#                    if pattern=='none':
+#                        width=[65,65,130]
+#                    else:
+#                        value=[' ','sum_debit','sum_credit','']
+#                        type=['string','string','string','lable']
+#                        width=[65,65,65,130]
+#                else:
+#                    if pattern=='none':
+#                        width=[65,65,65]
+#                    else:
+#                        value=[' ','sum_debit','sum_credit','']
+#                        type=['string','string','string','lable']
+#                        width=[65,65,65,65]
+#            else:
+#                if perc==1:
+#                    if pattern=='none':
+#                        value=['']
+#                        type=['lable']
+#                        width=[130]
+#                    else:
+#                        value=[' ','']
+#                        type=['string','lable']
+#                        width=[65,130]
+#                else:
+#                    if pattern=='none':
+#                        value=['']
+#                        type=['lable']
+#                        width=[65]
+#                    else:
+#                        value=[' ','']
+#                        type=['string','lable']
+#                        width=[65,65]
+#
+#        if not lst:
+#            lst.append(1)
+#        for ns in node.childNodes :
+#            if ns and ns.nodeName!='#text' and ns.tagName=='blockTable' and td :
+#                width_str = ns._attrs['colWidths'].nodeValue
+#                ns.removeAttribute('colWidths')
+#                total_td = td * len(value)
+#
+#                if not width:
+#                    for v in value:
+#                        width.append(30)
+#                check1=0
+#                for t in range(td):
+#                    for v in range(len(value)):
+#                        if type[v] in ('String','STRING','string'):
+#                            if (value[v]==" " or value[0]==pattern):
+#                                if check1==0:
+#                                    check1=1
+#                                    width_str +=',0.0'
+#                                else:
+#                                    width_str +=',%d'%width[v]
+#                            else:
+#                                width_str +=',%d'%width[v]
+#                        else:
+#                            width_str +=',%d'%width[v]
+#                ns.setAttribute('colWidths',width_str)
+#
+#                child_list =  ns.childNodes
+#
+#                check=0
+#                for child in child_list:
+#                    if child.nodeName=='tr':
+#                        lc = child.childNodes[1]
+#                        for t in range(td):
+#                            i=0
+#                            for v in value:
+#
+#                                newnode = lc.cloneNode(1)
+#                                temp2="%s['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]]"%(name)
+##
+#                                if type[i] in ('String','STRING','string'):
+#                                    if (v==" " or v==pattern) and i==0 and check==0:
+#                                        check=1
+#                                        if newnode.childNodes[1].lastChild:
+#                                            newnode.childNodes[1].lastChild.data=""
+#                                    else:
+#                                        if v==" ":
+#                                            if newnode.childNodes[1].lastChild:
+#                                                newnode.childNodes[1].lastChild.data=""
+#                                        else:
+#                                            t1= "[[ %s['%s%d'] ]]"%(name,v,t)
+#                                            if v=="year" or v=="sum_debit" or v=="sum_credit":
+#                                                if newnode.childNodes[1].lastChild:
+#                                                    newnode.childNodes[1].lastChild.data = t1
+#                                            else:
+#                                                if newnode.childNodes[1].lastChild:
+#                                                    newnode.childNodes[1].lastChild.data = t1+"[["+temp2
+##                                   newnode.childNodes[1].lastChild.data=[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]]
+#                                elif type[i] in ('Lable','LABLE','lable'):
+#                                    if newnode.childNodes[1].lastChild:
+#                                        newnode.childNodes[1].lastChild.data= v
+#
+#                                child.appendChild(newnode)
+#
+#                                newnode=False
+#                                i+=1
+#        return super(account_balance_landscape,self).repeatIn(lst, name, nodes_parent=False)
+#end
+    def linesForYear(self,form):
+        temp=0
+        years={}
+
+        global pattern
+        global show
+        global perc
+        global bal_zero
+        global ref_bal
+
+        pattern=form['compare_pattern']
+
+        if form['show_columns']!=1:
+            show=0
+        else:
+            show=form['show_columns']
+
+        if form['format_perc']!=1:
+            perc=0
+        else:
+            perc=form['format_perc']
+
+        if form['account_choice']=='bal_zero':
+            bal_zero=0
+        else:
+            bal_zero=1
+
+        ctx = self.context.copy()
+
+        if perc==1:
+            if form['select_account']!=False:
+                ref_ac=self.pool.get('account.account').browse(self.cr, self.uid,form['select_account'],ctx.copy())
+                if ref_ac.balance<>0.00:
+                    ref_bal=ref_ac.balance
+                else:
+                    ref_bal=1.00
+            else:
+                ref_bal='nothing'
+        else:
+            ref_bal='nothing'
+
+
+        total_for_perc=[]
+#       if perc==1:
+        self.done_total=1
+        self.total_for_perc=self.linesForTotal(form,ids={},doneAccount={},level=1)
+        self.done_total=0
+
+        for t1 in range(0,len(form['fiscalyear'][0][2])):
+            locale.setlocale(locale.LC_ALL, '')
+            self.result_total["sum_credit" + str(t1)]=locale.format("%.2f", self.result_total["sum_credit" + str(t1)], grouping=True)
+            self.result_total["sum_debit" + str(t1)]=locale.format("%.2f", self.result_total["sum_debit" + str(t1)], grouping=True)
+#           self.flag=1
+#           self.result_total = {}
+
+        for temp in range(0,len(form['fiscalyear'][0][2])):
+            fy=self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'][0][2][temp])
+            years["year"+str(temp)]=fy[0][1][12:16]
+
+        return [years]
+
+
+    def linesForTotal(self,form,ids={},doneAccount={},level=1):
+        if self.done_total==1:
+            self.done_total==1
+        else:
+            return [self.result_total]
+        accounts=[]
+        if not ids:
+            ids = self.ids
+        if not ids:
+            return []
+
+        ctx = self.context.copy()
+        result_total_parent=[]
+
+        for id in form['fiscalyear'][0][2]:
+            tmp=[]
+
+            ctx['fiscalyear'] = id
+            ctx['periods'] = form['periods'][0][2]
+            ctx['period_manner']=form['period_manner']
+            tmp = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx.copy())
+
+            if len(tmp):
+                accounts.append(tmp)
+
+        merged_accounts=zip(*accounts)
+         # used to check for the frst record so all sum_credit and sum_debit r set to 0.00
+        if level==1:
+            doneAccount={}
+        for entry in merged_accounts:
+
+            if entry[0].id in doneAccount:
+                continue
+            doneAccount[entry[0].id] = 1
+
+            for k in range(0,len(entry)):
+                temp_credit=0.00
+                temp_debit=0.00
+                if entry[0].type <> 'view':
+                    temp_credit+=entry[k].credit
+                    temp_debit+=entry[k].debit
+
+                if self.flag==1:
+                    self.result_total["sum_credit" + str(k)]=0.00
+                    self.result_total["sum_debit" + str(k)]=0.00
+
+                if form['account_choice']=='bal_zero':
+                    if temp_credit<>temp_debit:
+                        self.result_total["sum_credit" + str(k)]+=temp_credit
+                        self.result_total["sum_debit" + str(k)]+=temp_debit
+                else:
+                    self.result_total["sum_credit" + str(k)]+=temp_credit
+                    self.result_total["sum_debit" + str(k)]+=temp_debit
+
+            self.flag=2
+
+            if entry[0].child_id:
+                ids2 = [(x.code,x.id) for x in entry[0].child_id]
+                ids2.sort()
+
+                result_total_parent = self.linesForTotal(form, [x[1] for x in ids2],doneAccount,level+1)
+
+        return [self.result_total]
+
+    def lines(self, form, ids={}, done={}, level=1):
+        accounts=[]
+        if not ids:
+            ids = self.ids
+        if not ids:
+            return []
+        result = []
+        ctx = self.context.copy()
+        tmp1=[]
+        for id in form['fiscalyear'][0][2]:
+
+            ctx['fiscalyear'] = id
+            ctx['periods'] = form['periods'][0][2]
+            ctx['period_manner']=form['period_manner']
+
+            tmp1 = self.pool.get('account.account').browse(self.cr, self.uid, ids,ctx.copy())
+
+            if len(tmp1):
+                accounts.append(tmp1)
+
+        if level==1:   #if parent is called,done is not empty when called again.
+            done={}
+
+        def cmp_code(x, y):
+            return cmp(x.code, y.code)
+        for n in range(0,len(accounts)):
+            accounts[n].sort(cmp_code)
+        common={}
+        merged_accounts=zip(*accounts)
+
+        for entry in merged_accounts:
+            j=0
+            checked=1
+
+            if form['account_choice']!='all':    #  if checked,include empty a/c;not otherwise
+                checked=0
+
+            if entry[0].id in done:
+                continue
+            done[entry[0].id] = 1
+
+            if entry[0].child_id:  # this is for parent account,dont check 0 for it
+                checked=4
+                self.status=1 # for displaying it Bold
+            else:
+                self.status=0
+            if checked==0:
+                i=0
+                for i in range(0,len(entry)):
+                    if bal_zero==0:
+                        if entry[i].balance<>0.0:
+                            checked=4
+                            break
+                        else:
+                            checked=3
+                            i=i+1
+                    else:
+                        if entry[i].credit <> 0.0 or entry[i].debit <> 0.0:
+                            checked=4
+                            break
+                        else:
+                            checked=3
+                            i=i+1
+
+            if checked==3:
+                # this is the point where we skip those accounts which are encountered as empty ones
+                continue
+                self.empty_parent=0
+            else:
+                self.empty_parent=1
+                res = {
+                    'code': entry[0].code,
+                    'name': entry[0].name,
+                    'level': level,
+                    'status': self.status,
+                    }
+
+                for j in range(0,len(entry)):
+
+                    locale.setlocale(locale.LC_ALL, '')
+                    res["debit"+str(j)]=locale.format("%.2f", entry[j].debit, grouping=True)
+                    res["credit"+str(j)]=locale.format("%.2f", entry[j].credit, grouping=True)
+                    res["balance"+str(j)]=locale.format("%.2f", entry[j].balance, grouping=True)
+
+
+                    if j==0:
+                        res["bal_cash"+str(j)]="0.00"
+                        res["bal_perc"+str(j)]="0.00%"
+                    else:
+                        temp_cash=entry[j].balance - entry[j-1].balance
+                        res["bal_cash"+str(j)]=locale.format("%.2f", temp_cash, grouping=True)
+                        if entry[j-1].balance<>0.00:
+                            temp_perc=(entry[j].balance - entry[j-1].balance )*100/entry[j-1].balance
+                        else:
+                            temp_perc=(entry[j].balance) *100
+
+                        res["bal_perc"+str(j)]=locale.format("%.2f", temp_perc) + "%"
+
+
+                    if ref_bal=='nothing':
+                        if level==1:
+                            self.parent_bal=1
+                        else:
+                            self.parent_bal=0
+
+                        if self.parent_bal==1:
+                            res["balance_perc"+str(j)]="/"
+                        else:
+                            if entry[j].balance==0.00:
+                                if self.baldiv["baldiv"+str(level-1)+str(j)]<>0.00:
+                                    res["balance_perc"+str(j)]="0.00%"
+                                else:
+                                    res["balance_perc"+str(j)]="/"
+                            else:
+                                if self.baldiv["baldiv"+str(level-1)+str(j)]<>0.00:
+                                    temp=self.baldiv["baldiv"+str(level-1)+str(j)]
+                                    temp1=(entry[j].balance * 100 )/ float(temp)
+                                    temp1=round(temp1,2)
+                                    res["balance_perc" + str(j)]=str(temp1)+"%"
+                                else:
+                                    res["balance_perc"+str(j)]="/"
+                    else:
+                        res["balance_perc"+str(j)]=str( (entry[j].balance * 100 )/ float(ref_bal)) + "%"
+
+            result.append(res)
+
+            if entry[0].child_id:
+
+                for q in range(0,len(form['fiscalyear'][0][2])):
+                    self.baldiv["baldiv"+str(level)+str(q)]=entry[q].balance
+
+                ids2 = [(x.code,x.id) for x in entry[0].child_id]
+                ids2.sort()
+                dir=[]
+                dir += self.lines(form, [x[1] for x in ids2], done, level+1)
+                if dir==[]:
+                    for w in range(0,len(form['fiscalyear'][0][2])):
+                        if entry[w].credit <> 0.0 or entry[w].debit <> 0.0 or entry[w].balance<>0.00:
+                            dont_pop=1
+                            break
+                        else:
+                            dont_pop=0
+                    if dont_pop==1:
+                        result +=dir
+                    else:
+                        result.pop(-1)   # here we pop up the parent having its children as emprty accounts
+                else:
+                    result +=dir
+
+        return result
+    
+    def get_years(self,form):
+        result =[]
+        res={}
+        for temp in range(0,len(form['fiscalyear'][0][2])):
+            res={}
+            fy=self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'][0][2][temp])
+            res['year']=fy[0][1]
+            res['last_str']=temp
+            
+            result.append(res)
+        self.linesForYear(form)
+        return result
+    
+    def get_lines(self,year_dict,form):
+        final_result = []
+        line_l =[]
+        res = {}         
+        line_l = self.lines(form)
+        self.cal_total(year_dict)
+        if line_l:
+            for l in line_l:
+                res = {}
+                res['code'] = l['code']
+                res['name'] = l['name']
+                res['level'] = l['level']
+                for k,v in l.items():
+                    if k.startswith('debit'+str(year_dict['last_str'])):
+                     res['debit'] = v  
+                    if k.startswith('credit'+str(year_dict['last_str'])):
+                     res['credit'] = v
+                    if k.startswith('balance'+str(year_dict['last_str'])) and not k.startswith('balance_perc'+str(year_dict['last_str'])):
+                     res['balance'] =v 
+                    if k.startswith('balance_perc'+str(year_dict['last_str'])) and not k.startswith('balance'+str(year_dict['last_str'])):
+                     res['balance_perc'] = v
+                    if form['compare_pattern'] == 'bal_perc':
+                        if k.startswith('bal_perc'+str(year_dict['last_str'])):
+                         res['pattern'] = v
+                    elif form['compare_pattern'] == 'bal_cash':
+                        if k.startswith('bal_cash'+str(year_dict['last_str'])):
+                         res['pattern'] = v
+                    else:
+                         res['pattern'] = ''
+                final_result.append(res)
+        return final_result
+
+    def cal_total(self,year_dict):
+        total_l = self.result_total
+        if total_l:
+            for k,v in total_l.items():
+                if k.startswith('sum_debit'+str(year_dict['last_str'])):
+                    self.dr_total = v
+                elif k.startswith('sum_credit'+str(year_dict['last_str'])):
+                    self.cr_total = v
+                else:
+                    continue
+        return True
+    
+    def total_dr(self):
+        return self.dr_total
+    
+    def total_cr(self):
+        return self.cr_total
+
+report_sxw.report_sxw('report.account.account.balance.landscape', 'account.account', 'addons/account_balance/report/account_balance_landscape.rml', parser=account_balance_landscape, header=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_balance/report/account_balance_landscape.rml b/addons/account_balance/report/account_balance_landscape.rml
index de02427c410..13a00655d5e 100644
--- a/addons/account_balance/report/account_balance_landscape.rml
+++ b/addons/account_balance/report/account_balance_landscape.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(1120.0,570.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="15.0" y1="15.0" width="1080" height="530"/>
+      <frame id="first" x1="28.0" y1="28.0" width="786" height="539"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,170 +10,308 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table_Tiltle">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_header_account">
+      <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <blockBackground colorName="#b3b3b3" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#b3b3b3" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#b3b3b3" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#b3b3b3" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#b3b3b3" start="4,0" stop="4,-1"/>
+      <blockBackground colorName="#b3b3b3" start="5,0" stop="5,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
-      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
-      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table61">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="red"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <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"/>
+      <blockBackground colorName="#b3b3b3" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#b3b3b3" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#b3b3b3" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#b3b3b3" start="3,0" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Times-Roman" fontSize="12.0" leading="18" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P3" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P4" fontName="Times-Roman" fontSize="9.0" alignment="CENTER"/>
-    <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="9.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P8" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="P9" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" rightIndent="17.0" leftIndent="-0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="1.0"/>
-    <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="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" 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="0.0" spaceAfter="0.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="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.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="0.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_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
+  <images/>
   <story>
-    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table1">
+    <para style="terp_default_8">[[ repeatIn(get_years(data['form']), 'y') ]]</para>
+    <blockTable colWidths="785.0" style="Table_Tiltle">
       <tr>
         <td>
-          <para style="Table Contents">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P1">Account balance</para>
-        </td>
-        <td>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="Table Contents">[[ company.name ]]</para>
-        </td>
-        <td>
-          <para style="P4">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P5">Currency: [[ company.currency_id.name ]]</para>
+          <para style="terp_header_Centre">Account Balance - [[ company.currency_id.name ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="Standard">
+    <para style="terp_default_space">
       <font color="white"> </font>
     </para>
-    <para style="P8">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
-     <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P13"> [[repeatIn(linesForYear(data['form']),'year_header',td=len(data['form']['fiscalyear'][0][2]),width=[126],value=['year'],type=['string']) ]]</para>
-      <blockTable colWidths="180.0" style="Table6">
-		 <tr>
-          <td>
-            <para style="P1">Account Information</para>
-          </td>
-         </tr>
-      </blockTable>
-    </section>
-    <section>
-      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['Debit','Credit','Balance'],type=['lable','lable','lable']) ]]</para>
-      <blockTable colWidths="30.0,150.0" style="Table6">
-        <tr>
-          <td>
-            <para style="P1">Code</para>
-          </td>
-          <td>
-            <para style="P1">Account Name</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <section>
-      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[84,42],value=['Cash','%'],type=['lable','lable']) ]]</para>
-      <blockTable colWidths="180.0" style="Table5">
-        <tr>
-          <td>
-            <para style="P4"> </para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P13">[[ repeatIn(lines(data['form']),'a',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['debit','credit','balance'],type=['string','string','string']) ]]</para>
-      <blockTable colWidths="0.0,28.0,152.0" style="Table5">
-        <tr>
+    <para style="terp_header">Year : [[ y['year'] ]]</para>
+    <blockTable colWidths="56.0,198.0,95.0,110.0,105.0,164.0" style="Table_header_account">
+      <tr>
         <td>
-            <para style="P3"> </para>
-          </td>
-          <td>
-            <para style="P7">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Times-bold'})) ]][[ a['code'] ]]</para>
-          </td>
-          <td>
-          <para style="P2"><font>[['.....'*(a['level']-1) ]][[ setTag('font','font',{'color':'white'}) ]]</font><font>[[ a['status']==1 and ( setTag('font','font',{'name':'Times-bold'})) ]][[ a['name'] ]]</font></para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="P8">
+          <para style="terp_tblheader_Details">[[ data['form']['show_columns'] and 'Code' or removeParentNode('blockTable') ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Account Name </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('font') ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="56.0,198.0,206.0,268.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">[[ data['form']['show_columns'] and removeParentNode('blockTable') or 'Code' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Account Name </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details"><font>[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('font') ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
       <font color="white"> </font>
     </para>
     <section>
-     <para style="P13">[[ repeatIn(linesForTotal(data['form']),'total',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['sum_debit','sum_credit',''],type=['string','string','lable'] ) ]]</para>
-      <blockTable colWidths="180.0" style="Table6">
+      <para style="terp_default_8">[[ repeatIn(get_lines(y,data['form']), 'a') ]]</para>
+      <blockTable colWidths="56.0,197.0,94.0,110.0,106.0,162.0" style="Table4">
         <tr>
           <td>
-            <para style="P3">Total:[[ data['form']['show_columns']==0 and removeParentNode('section')]]</para>
+            <para style="terp_default_9">[[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['pattern'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['debit'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['credit'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
           </td>
         </tr>
       </blockTable>
+      <para style="terp_default_2"/>
+      <blockTable colWidths="56.0,197.0,94.0,110.0,107.0,85.0,77.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['pattern'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['debit'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['credit'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['balance_perc'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="55.0,197.0,94.0,380.0" style="Table6">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font> [[ a['name'] ]]</font></para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['pattern'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="54.0,197.0,94.0,275.0,106.0" style="Table5">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font> [[ a['name'] ]]</font></para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['pattern'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['balance_perc'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2"/>
     </section>
-
-    <para style="Standard">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
+    <blockTable colWidths="52.0,291.0,112.0,107.0,164.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ not data['form']['show_columns'] and removeParentNode('blockTable') ]] </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Total :</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ total_dr() ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ total_cr() ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and "C.S.Y.T.(C./P) : Compare Selected Years In Terms of Cash/Perc" or removeParentNode('font') ]]</para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account_balance/report/account_balance_landscape_old_backup.rml b/addons/account_balance/report/account_balance_landscape_old_backup.rml
new file mode 100644
index 00000000000..830c20ba2aa
--- /dev/null
+++ b/addons/account_balance/report/account_balance_landscape_old_backup.rml
@@ -0,0 +1,182 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20" >
+    <pageTemplate id="first">
+      <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
+      <blockBackground colorName="#e6e6e6" start="2,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table61">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="red"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="12.0" leading="18" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="1.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+  </stylesheet>
+  <story>
+    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table1">
+      <tr>
+        <td>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P1">Account balance</para>
+        </td>
+        <td>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="Table Contents">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">Currency: [[ company.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="P8">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
+     <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P13"> [[repeatIn(linesForYear(data['form']),'year_header',td=len(data['form']['fiscalyear'][0][2]),width=[126],value=['year'],type=['string']) ]]</para>
+      <blockTable colWidths="180.0" style="Table6">
+		 <tr>
+          <td>
+            <para style="P1">Account Information</para>
+          </td>
+         </tr>
+      </blockTable>
+    </section>
+    <section>
+      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['Debit','Credit','Balance'],type=['lable','lable','lable']) ]]</para>
+      <blockTable colWidths="30.0,150.0" style="Table6">
+        <tr>
+          <td>
+            <para style="P1">Code</para>
+          </td>
+          <td>
+            <para style="P1">Account Name</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <section>
+      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[84,42],value=['Cash','%'],type=['lable','lable']) ]]</para>
+      <blockTable colWidths="180.0" style="Table5">
+        <tr>
+          <td>
+            <para style="P4"></para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P13">[[ repeatIn(lines(data['form']),'a',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['debit','credit','balance'],type=['string','string','string']) ]]</para>
+      <blockTable colWidths="0.0,28.0,152.0" style="Table5">
+        <tr>
+        <td>
+            <para style="P3"> </para>
+          </td>
+          <td>
+            <para style="P7">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['code'] ]]</para>
+          </td>
+          <td>
+          <para style="P2"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['status']==1 and ( setTag('font','font',{'name':'Helvetica-bold'})) ]][[ a['name'] ]]</font></para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <section>
+     <para style="P13">[[ repeatIn(linesForTotal(data['form']),'total',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['sum_debit','sum_credit',''],type=['string','string','lable'] ) ]]</para>
+      <blockTable colWidths="180.0" style="Table6">
+        <tr>
+          <td>
+            <para style="P3">Total:[[ data['form']['show_columns']==0 and removeParentNode('section')]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/account_balance/report/account_balance_old_backup.rml b/addons/account_balance/report/account_balance_old_backup.rml
new file mode 100644
index 00000000000..1d60a242eb8
--- /dev/null
+++ b/addons/account_balance/report/account_balance_old_backup.rml
@@ -0,0 +1,179 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(635.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="15.0" y1="15.0" width="615" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
+      <blockBackground colorName="#e6e6e6" start="2,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
+      
+    </blockTableStyle>
+    <blockTableStyle id="Table61">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="red"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="12.0" leading="18" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" />
+    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="1.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+  </stylesheet>
+  <story>
+    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table1">
+      <tr>
+        <td>
+        <para style="Table Contents"><font color="white"> </font></para>
+        </td>
+        <td>
+        <para style="P1">Account balance</para>
+        </td>
+        <td>
+        <para style="P3"><font color="white"> </font></para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+        <para style="Table Contents">[[ company.name ]]</para>
+        </td>
+        <td>
+        <para style="P4"><font color="white"> </font></para>
+        </td>
+        <td>
+        <para style="P5">Currency: [[ company.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="P8">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
+     <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P13"> [[repeatIn(linesForYear(data['form']),'year_header',td=len(data['form']['fiscalyear'][0][2]),width=[126],value=['year'],type=['string']) ]]</para>
+      <blockTable colWidths="190.0" style="Table6">
+		 <tr>
+          <td>
+          <para style="P1">Account Information</para>
+          </td>
+         </tr>
+      </blockTable>
+    </section>
+    <section>
+      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['Debit','Credit','Balance'],type=['lable','lable','lable']) ]]</para>
+      <blockTable colWidths="30.0,160.0" style="Table6">
+        <tr>
+          <td>
+          <para style="P1">Code</para>
+          </td>
+          <td>
+          <para style="P1">Account Name</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <section>
+      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[84,42],value=['Cash','%'],type=['lable','lable']) ]]</para>
+      <blockTable colWidths="190.0" style="Table5">
+        <tr>
+          <td>
+          <para style="P4"><font color="white"> </font></para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P13">[[ repeatIn(lines(data['form']),'a',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['debit','credit','balance'],type=['string','string','string']) ]]</para>
+      <condPageBreak height="2cm"/>
+      <blockTable colWidths="0.0,28.0,162.0" style="Table5">
+        <tr>
+        <td>
+        <para style="P3">
+        <font color="white"> </font>
+        </para>
+        </td>
+        <td>
+        <para style="P7">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['code'] ]]</para>
+        </td>
+        <td>
+        <para style="P2"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['status']==1 and ( setTag('font','font',{'name':'Helvetica-bold'})) ]][[ a['name'] ]]</font></para>
+        </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <section>
+     <para style="P13">[[ repeatIn(linesForTotal(data['form']),'total',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['sum_debit','sum_credit',''],type=['string','string','lable'] ) ]]</para>
+      <blockTable colWidths="190.0" style="Table6">
+        <tr>
+          <td>
+          	 <para style="P3">Total:[[ data['form']['show_columns']==0 and removeParentNode('section')]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/account_balance/report/rml_parse.py b/addons/account_balance/report/rml_parse.py
new file mode 100644
index 00000000000..c5eceb5bcd1
--- /dev/null
+++ b/addons/account_balance/report/rml_parse.py
@@ -0,0 +1,170 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from report import report_sxw
+import xml.dom.minidom
+import os, time
+import osv
+import re
+import tools
+import pooler
+import re
+import sys
+
+
+class rml_parse(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(rml_parse, self).__init__(cr, uid, name, context=None)
+        self.localcontext.update({
+            'comma_me': self.comma_me,
+            'format_date': self._get_and_change_date_format_for_swiss,
+            'strip_name' : self._strip_name,
+            'explode_name' : self._explode_name,
+        })
+
+    def comma_me(self,amount):
+        #print "#" + str(amount) + "#"
+        if not amount:
+            amount = 0.0
+        if  type(amount) is float :
+            amount = str('%.2f'%amount)
+        else :
+            amount = str(amount)
+        if (amount == '0'):
+             return ' '
+        orig = amount
+        new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
+        if orig == new:
+            return new
+        else:
+            return self.comma_me(new)
+        
+    def _ellipsis(self, string, maxlen=100, ellipsis = '...'):
+        ellipsis = ellipsis or ''
+        try:
+            return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen]
+        except Exception, e:
+            return False
+        
+    def _strip_name(self, name, maxlen=50):
+        return self._ellipsis(name, maxlen, '...')
+
+    def _get_and_change_date_format_for_swiss (self,date_to_format):
+        date_formatted=''
+        if date_to_format:
+            date_formatted = strptime (date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
+        return date_formatted
+
+    def _explode_name(self,chaine,length):
+        # We will test if the size is less then account
+        full_string = ''
+        if (len(str(chaine)) <= length):
+            return chaine
+        #
+        else:
+            chaine = unicode(chaine,'utf8').encode('iso-8859-1')
+            rup = 0
+            for carac in chaine:
+                rup = rup + 1
+                if rup == length:
+                    full_string = full_string + '\n'
+                    full_string = full_string + carac
+                    rup = 0
+                else:
+                    full_string = full_string + carac
+
+        return full_string
+
+    def makeAscii(self,str):
+        try:
+            Stringer = str.encode("utf-8")
+        except UnicodeDecodeError:
+            try:
+                Stringer = str.encode("utf-16")
+            except UnicodeDecodeError:
+                print "UTF_16 Error"
+                Stringer = str
+            else:
+                return Stringer
+        else:
+            return Stringer
+        return Stringer
+    
+    def explode_this(self,chaine,length):
+        #chaine = self.repair_string(chaine)
+        chaine = rstrip(chaine)
+        ast = list(chaine)
+        i = length
+        while i <= len(ast):
+            ast.insert(i,'\n')
+            i = i + length
+        chaine = str("".join(ast))
+        return chaine
+    
+    def repair_string(self,chaine):
+        ast = list(chaine)
+        UnicodeAst = []
+        _previouslyfound = False
+        i = 0
+        #print str(ast)
+        while i < len(ast):
+            elem = ast[i]
+            try:
+                Stringer = elem.encode("utf-8")
+            except UnicodeDecodeError:
+                to_reencode = elem + ast[i+1]
+                print str(to_reencode)
+                Good_char = to_reencode.decode('utf-8')
+                UnicodeAst.append(Good_char)
+                i += i +2
+            else:
+                UnicodeAst.append(elem)
+                i += i + 1
+
+
+        return "".join(UnicodeAst)
+
+    def ReencodeAscii(self,str):
+        print sys.stdin.encoding
+        try:
+            Stringer = str.decode("ascii")
+        except UnicodeEncodeError:
+            print "REENCODING ERROR"
+            return str.encode("ascii")
+        except UnicodeDecodeError:
+            print "DECODING ERROR"
+            return str.encode("ascii")
+
+        else:
+            print Stringer
+            return Stringer
+        
+    def _add_header(self, node, header=1):
+        if header==2:
+            rml_head =  self.rml_header2
+        else:
+            rml_head =  self.rml_header
+        rml_head =  rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''')
+        return True
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/report/report_voucher.rml b/addons/account_voucher/report/report_voucher.rml
index 7eb7e884bda..abd22ecc428 100755
--- a/addons/account_voucher/report/report_voucher.rml
+++ b/addons/account_voucher/report/report_voucher.rml
@@ -104,7 +104,7 @@
     <para style="P2">Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]]</para>
     <para style="P24">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
     <para style="P2">Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]]</para>
-    
+
     <blockTable colWidths="49.0,143.0,116.0,69.0,106.0" style="Table1">
       <tr>
         <td>
@@ -171,7 +171,7 @@
     <blockTable colWidths="482.0" style="voucher_lines">
       <tr>
         <td>
-          <para style="P20">[[ repeatIn(voucher.move_ids,'move_ids') ]] </para>
+          <para style="P20">[[ repeatIn(voucher.move_ids,'move_ids') ]] <font>[[ (not move_ids) and removeParentNode('blockTable') ]]</font></para>
           <blockTable colWidths="251.0,110.0,115.0" style="Table2">
             <tr>
               <td>
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 760c670246c..7bc2e7e7ee5 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -98,6 +98,26 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -113,6 +133,7 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -147,7 +168,9 @@
     <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_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
   </stylesheet>
+  <images/>
   <story>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]] </para>
     <para style="terp_default_8">
@@ -160,7 +183,7 @@
       <font color="white"> </font>
     </para>
     <para style="terp_header">Production Order N° : [[ o.name ]]</para>
-    <para style="terp_default_8">
+    <para style="terp_default_space">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="193.0,106.0,96.0,132.0" style="Table3">
@@ -195,10 +218,7 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
+    <para style="terp_default_space">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="118.0,147.0,132.0,131.0" repeatRows="1" style="Table1">
@@ -235,10 +255,13 @@
         </tr>
       </blockTable>
     </section>
-    <para style="terp_default_9">
+    <para style="terp_default_space">
       <font color="white"> </font>
     </para>
     <para style="terp_default_Bold_8">Work Orders</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="81.0,155.0,125.0,84.0,83.0" style="Table6">
       <tr>
         <td>
@@ -257,36 +280,46 @@
           <para style="terp_tblheader_General_Centre">No. Of Hours</para>
         </td>
       </tr>
-      <tr>
-        <td>
-          <para style="terp_default_Centre_8">[[ repeatIn(o.workcenter_lines,'line2') ]]</para>
-          <para style="terp_default_Centre_8">[[ line2.sequence ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ line2.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ line2.workcenter_id.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ formatLang(line2.cycle) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ formatLang(line2.hour) ]]</para>
-        </td>
-      </tr>
     </blockTable>
-    <para style="terp_default_9">
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.workcenter_lines,'line2') ]]</para>
+      <blockTable colWidths="81.0,155.0,125.0,84.0,83.0" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_default_Centre_8">[[ line2.sequence ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_8">[[ line2.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_8">[[ line2.workcenter_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_8">[[ formatLang(line2.cycle) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_8">[[ formatLang(line2.hour) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_space">
       <font color="white"> </font>
     </para>
     <para style="terp_default_Bold_9">Bill Of Material </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="235.0,82.0,107.0,104.0" style="Table8">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Source Location</para>
@@ -298,13 +331,16 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.move_lines,'line') ]]</para>
-      <blockTable colWidths="235.0,81.0,108.0,104.0" style="Table9">
+      <blockTable colWidths="235.0,47.0,34.0,108.0,104.0" style="Table9">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.product_id.code ]] [[ line.product_id.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang( line.product_qty) ]] [[line.product_uom.name]]</para>
+            <para style="terp_default_Right_9">[[ formatLang( line.product_qty) ]] </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[line.product_uom.name]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ line.location_id.name ]]</para>
@@ -320,4 +356,3 @@
     </section>
   </story>
 </document>
-
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index f1d9fd737e1..54423775614 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -33,7 +33,6 @@ class pos_invoice(report_sxw.rml_parse):
         self.localcontext.update({
             'time': time,
         })
-        print
 
     def set_context(self, objects, data, ids, report_type=None):
         super(pos_invoice, self).set_context(objects, data, ids, report_type)
diff --git a/addons/sale_delivery_report/report/shipping.rml b/addons/sale_delivery_report/report/shipping.rml
index 30061c03352..e9c26f0e6ae 100644
--- a/addons/sale_delivery_report/report/shipping.rml
+++ b/addons/sale_delivery_report/report/shipping.rml
@@ -110,7 +110,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ not(o.sale_id) and 'Error, no sale order attached to this picking !' or '' ]]</para>
+    <para style="terp_default_9">[[ (not(o.sale_id) and o.type== 'out') and 'Error, no sale order attached to this picking !' or removeParentNode('para') ]]</para>
     <blockTable colWidths="287.0,254.0" repeatRows="1" style="Tableau1">
       <tr>
         <td>
diff --git a/addons/stock/report/lot_location.rml b/addons/stock/report/lot_location.rml
index 94cc3f51340..c7524d13691 100644
--- a/addons/stock/report/lot_location.rml
+++ b/addons/stock/report/lot_location.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,96 +10,199 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <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="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-	  <lineStyle kind="LINEBELOW" colorName="#d4d4d4" start="1,1" stop="3,-1"/>
-    </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="3,0"/>
+      <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="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-     <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="3,0"/>
-     <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-BoldOblique" fontSize="6.0" leading="8"/>
-    <paraStyle name="P2" fontName="Times-Roman"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P41" fontName="Helvetica-BoldOblique" fontSize="0.0" leading="0" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Helvetica-BoldOblique" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Helvetica-BoldOblique" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9" fontName="Helvetica-BoldOblique" fontSize="2.0" leading="3" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10a" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P121" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="1.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <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="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <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="0.0" spaceAfter="0.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="0.0" spaceAfter="0.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="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.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="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.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="Times-Roman" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
   <images/>
   <story>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
       <section>
-       	<para style="P121"><font color="white">[[ repeatIn(objects,'o') ]]</font></para>
-       	<section>
-        <para style="P121"><font color="white">[[ repeatIn(process(o.id),'ob') ]]</font></para>
-        <blockTable colWidths="202.0,234.0,65.0,25" repeatRows="1" style="Table4">
-         <tr>
-          	<td><para style="P6">[[ ob['product'] or removeParentNode('blockTable') ]] Location</para></td>
-          	<td><para style="P6">Product</para></td>
-          	<td><para style="P7">Quantity</para></td>
-          	<td><para><font color="white"> </font></para></td>
-          </tr>
+        <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
+        <blockTable colWidths="138.0,254.0,57.0,33.0" style="Table2">
           <tr>
-            <td><para style="P5">[[ ob['location_name'] ]]</para></td>
-            <td><para><font color="white"> </font></para></td>
-            <td><para><font color="white"> </font></para></td>
-            <td><para><font color="white"> </font></para></td>
-          </tr>
-          <tr>
-            <td><para style="P3">[[ repeatIn(ob['product'], 'p') ]] </para></td>
-            <td><para style="P3">[[ p['prod_name'] ]]</para></td>
-            <td><para style="P12">[[ p['prod_qty'] ]]</para></td>
-            <td><para style="P12">[[ p['uom'] ]]</para></td>
-          </tr>
-          <tr>
-            <td><para style="P10"></para></td>
-            <td><para style="P10a">Total : </para></td>
-            <td><para style="P10">[[ ob['total'] ]]</para></td>
-            <td><para style="P10">Units</para></td>
+            <td>
+              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] Location</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Product</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">Quantity</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">
+                <font color="white"> </font>
+              </para>
+            </td>
           </tr>
         </blockTable>
-        <para style="P10"></para>
-        </section>
-        </section>
-        <blockTable colWidths="200.0,235.0,60.0,25" style="Table3">
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
+        <blockTable colWidths="138.0,254.0,57.0,33.0" style="Table3">
           <tr>
-            <td><para style="P10a">Grand Total:</para></td>
-            <td><para style="P10"></para></td>
-            <td><para style="P10">[[ qty_total() ]]</para></td>
-            <td><para style="P10">Units</para></td>
+            <td>
+              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] [[ ob['location_name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
           </tr>
         </blockTable>
+        <section>
+          <para style="terp_default_9">[[ repeatIn(ob['product'], 'p') ]]</para>
+          <blockTable colWidths="138.0,254.0,57.0,33.0" style="Table6">
+            <tr>
+              <td>
+                <para style="terp_default_9">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_9">[[ p['prod_name'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ p['prod_qty'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ p['uom'] ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+        </section>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
+        <blockTable colWidths="138.0,254.0,57.0,33.0" style="Table5">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Total :</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">[[ ob['total'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Units</para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
+      </section>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <blockTable colWidths="138.0,255.0,56.0,34.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Grand Total:</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ qty_total() ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Units</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml
index ad05b011757..b26c9842636 100644
--- a/addons/stock/report/lot_overview.rml
+++ b/addons/stock/report/lot_overview.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,104 +10,290 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-    	<lineStyle kind="LINEBELOW" colorName="#d4d4d4" start="1,1" stop="-1,-1"/>
+      <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica-BoldOblique" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P41" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P7" fontName="Helvetica-BoldOblique" fontSize="6.0" leading="8"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P8a" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9" fontName="Helvetica-BoldOblique" fontSize="2.0" leading="3" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10a" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10b" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10c" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P121" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="1.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
     <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="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
     <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="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="15.0" leading="19" 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="0.0" spaceAfter="0.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="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.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="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_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"/>
   </stylesheet>
   <images/>
   <story>
     <section>
-      <para style="P121"><font color="white">[[ repeatIn(objects,'o') ]]</font></para>
+      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
       <section>
-      	<para style="P121">[[ repeatIn(process(o.id),'ob') ]]</para>
-        <blockTable colWidths="60.0,200.0,56.0,55.0,52.0,56.0,68.0" repeatRows="1" style="Table2">
-        <tr>
-         <td><para style="P1">[[ ob['product'] or removeParentNode('blockTable') ]] Location</para></td>
-         <td><para style="P1">Product</para></td>
-          <td><para style="P1">Variants</para></td>
-          <td><para style="P10a">Quantity</para></td>
-          <td><para style="P10a">UoM</para></td>
-          <td><para style="P10c">Unit Price</para></td>
-          <td><para style="P10a">Value</para></td>
-        </tr>
-        <tr>
-	        <td><para style="P41">[[ ob['location_name'] ]]</para></td>
-	        <td><para><font color="white"></font></para></td>
-	        <td><para><font color="white"></font></para></td>
-	        <td><para><font color="white"></font></para></td>
-	        <td><para><font color="white"></font></para></td>
-	        <td><para><font color="white"></font></para></td>
-	        <td><para><font color="white"></font></para></td>
-        </tr>
-        <tr>
-            <td><para style="P121">[[ repeatIn(ob['product'],'p') ]]</para></td>
-            <td><para style="P12">[[ p['prod_name'] ]]</para></td>
-            <td><para style="P4">[[ p['variants'] ]]</para></td>
-            <td><para style="P10b">[[ p['prod_qty'] ]]</para></td>
-            <td><para style="P10b">[[ p['uom'] ]]</para></td>
-            <td><para style="P10b">[[ p['price'] ]]</para></td>
-            <td><para style="P10b">[[ p['price_value'] ]]</para></td>
-          </tr>
-           <tr>
-            <td><para style="P8"></para></td>
-            <td><para style="P8">Total:</para></td>
-            <td><para style="P8"></para></td>
-            <td><para style="P8"></para></td>
-            <td><para style="P8"></para></td>
-            <td><para style="P8"></para></td>
-            <td><para style="P8a"><u>[[ price_total() ]]</u></para></td>
-          </tr>
-        </blockTable>
-        <para style="P11"><font color="white"> </font></para>
-      </section>
-    </section>
-    <blockTable colWidths="180,60,61.0,55.0,59.0,56.0,68.0" style="Table3">
+        <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
+        <blockTable colWidths="99.0,137.0,51.0,54.0,38.0,60.0,43.0" repeatRows="1" style="Table1">
           <tr>
-            <td><para style="P8">Grand Total:</para></td>
-            <td><para style="P8"></para></td>
-            <td><para style="P8"></para></td>
-            <td><para style="P8"></para></td>
-            <td><para style="P8"></para></td>
-            <td><para style="P8"></para></td>
-            <td><para style="P8a">[[ grand_total_price() ]]</para></td>
+            <td>
+              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] Location</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Product</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">Variants</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">Amount</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">UoM</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">Unit Price</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">Value</para>
+            </td>
           </tr>
         </blockTable>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
+        <blockTable colWidths="99.0,137.0,51.0,54.0,38.0,60.0,43.0" repeatRows="1" style="Table3">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] [[ ob['location_name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
+        <section>
+          <para style="terp_default_8">[[ repeatIn(ob['product'],'p') ]]</para>
+          <blockTable colWidths="99.0,137.0,51.0,54.0,38.0,60.0,43.0" repeatRows="1" style="Table4">
+            <tr>
+              <td>
+                <para style="terp_default_9">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_9">[[ p['prod_name'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ p['variants'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ p['prod_qty'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ p['uom'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ p['price'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ p['price_value'] ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+        </section>
+        <blockTable colWidths="99.0,137.0,51.0,54.0,38.0,60.0,43.0" repeatRows="1" style="Table5">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Total:</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">[[ price_total() ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
+      </section>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="99.0,137.0,51.0,54.0,38.0,56.0,47.0" repeatRows="1" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Grand Total:</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ grand_total_price() ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index 0df08385c9a..03ebff7dedc 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,107 +10,316 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table4">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#d4d4d4" start="1,0" stop="-1,-1"/>
+      <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-BoldOblique" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5a" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9" fontName="Helvetica"/>
-    <paraStyle name="P10" fontName="Helvetica-BoldOblique" fontSize="6.0" leading="8"/>
-    <paraStyle name="P101" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P102" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P121" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="1.0"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
     <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="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
     <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="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="15.0" leading="19" 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="0.0" spaceAfter="0.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="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.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="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_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"/>
   </stylesheet>
   <images/>
   <story>
     <section>
-      <para style="P121"><font color="white">[[ repeatIn(objects,'o') ]] </font></para>
+      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
       <section>
-        <para style="P121"><font color="white">[[ repeatIn(process(o.id),'ob') ]]</font></para>
-        <blockTable colWidths="80,35.0,140.0,50.0,50.0,42.0,56.0,58.0" style="Table4">
-         <tr>
-        	<td><para style="P2">[[ ob['product'] or removeParentNode('blockTable') ]] Location</para></td>
-            <td><para style="P2">Code</para></td>
-            <td><para style="P2">Product</para></td>
-            <td><para style="P2">Variants</para></td>
-            <td><para style="P3">Amount</para></td>
-            <td><para style="P4">UoM</para></td>
-            <td><para style="P3">UnitPrice</para></td>
-            <td><para style="P3">Value</para></td>
-         </tr>
-         <tr>
-	        <td><para style="P102">[[ ob['location_name'] ]]</para></td>
-	        <td><para style="Standard"><font color="white"></font></para></td>
-	        <td><para style="Standard"><font color="white"></font></para></td>
-	        <td><para style="Standard"><font color="white"></font></para></td>
-	        <td><para style="Standard"><font color="white"></font></para></td>
-	        <td><para style="Standard"><font color="white"></font></para></td>
-	        <td><para style="Standard"><font color="white"></font></para></td>
-	        <td><para style="Standard"><font color="white"></font></para></td>
-         </tr>
+        <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
+        <blockTable colWidths="72.0,35.0,133.0,47.0,58.0,33.0,60.0,43.0" repeatRows="1" style="Table1">
           <tr>
-            <td><para style="P7">[[ repeatIn(ob['product'],'p') ]]</para></td>
-            <td><para style="P7">[[ p['code'] ]]</para></td>
-            <td><para style="P7">[[ p['prod_name'] ]]</para></td>
-            <td><para style="P11">[[ p['variants'] ]]</para></td>
-            <td><para style="P12">[[ p['prod_qty'] ]]</para></td>
-            <td><para style="P13">[[ p['uom'] ]]</para></td>
-            <td><para style="P12">[[ p['price'] ]]</para></td>
-            <td><para style="P12">[[ p['price_value'] ]]</para></td>
-          </tr>
-          <tr>
-           	<td><para style="P5"><font color="white"> </font></para></td>
-            <td><para style="P5">Total:</para></td>
-            <td><para style="P5"><font color="white"> </font></para></td>
-            <td><para style="P5"><font color="white"> </font></para></td>
-            <td><para style="P5"><font color="white"> </font></para></td>
-            <td><para style="P5"><font color="white"> </font></para></td>
-            <td><para style="P5"><font color="white"> </font></para></td>
-            <td><para style="P5a"><u>[[ price_total() ]]</u></para></td>
+            <td>
+              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] Location</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Code</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Product</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">Variants</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">Amount</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">UoM</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">Unit Price</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">Value</para>
+            </td>
           </tr>
         </blockTable>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
+        <blockTable colWidths="72.0,35.0,133.0,47.0,58.0,33.0,60.0,43.0" repeatRows="1" style="Table3">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] [[ ob['location_name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
+        <section>
+          <para style="terp_default_8">[[ repeatIn(ob['product'],'p') ]]</para>
+          <blockTable colWidths="72.0,35.0,133.0,47.0,58.0,33.0,60.0,43.0" repeatRows="1" style="Table4">
+            <tr>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_9">[[ p['code'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_9">[[ p['prod_name'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ p['variants'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ p['prod_qty'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ p['uom'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ p['price'] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ p['price_value'] ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+        </section>
+        <blockTable colWidths="72.0,35.0,133.0,47.0,58.0,33.0,60.0,43.0" repeatRows="1" style="Table5">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Total:</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">[[ price_total() ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
       </section>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
     </section>
-    <blockTable colWidths="80,35.0,140.0,50.0,50.0,42.0,56.0,58.0" style="Table3">
-          <tr>
-            <td><para style="P5">Grand Total:</para></td>
-            <td><para style="P5"><font color="white"> </font></para></td>
-            <td><para style="P5"><font color="white"> </font></para></td>
-            <td><para style="P5"><font color="white"> </font></para></td>
-            <td><para style="P5"><font color="white"> </font></para></td>
-            <td><para style="P5"><font color="white"> </font></para></td>
-            <td><para style="P5"><font color="white"> </font></para></td>
-            <td><para style="P5a">[[ grand_total_price() ]]</para></td>
-          </tr>
-        </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="73.0,36.0,133.0,46.0,58.0,34.0,56.0,47.0" repeatRows="1" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Grand Total:</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ grand_total_price() ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 203ccf64fee..8de93045b84 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -94,19 +94,19 @@
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.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_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" 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" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" 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_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" 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_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Table Contents" fontName="Times-Roman"/>
     <paraStyle name="Footer" fontName="Times-Roman"/>
     <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
     <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_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.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="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -115,14 +115,11 @@
     <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_5cm_Above_Space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1cm_above_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
   </stylesheet>
   <images/>
   <story>
-    <para style="terp_default_8">[[ repeatIn(objects,'picking') ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_header_Centre"/>
+    <para style="terp_default_8">[[ repeatIn(objects,'picking') ]] </para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
@@ -134,24 +131,38 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]][[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]][[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]]</para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]]</para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]][[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]][[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]][[ picking.address_id and picking.address_id.zip or '' ]]</para>
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">[[ picking.sale_id and picking.sale_id.partner_shipping_id and 'Shipping Address :' or removeParentNode('para') ]] </para>
+          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
+    <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
+    <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="538.0" style="Table_Title_String">
@@ -164,6 +175,9 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
+    <para style="terp_default_5cm_Above_Space">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="123.0,134.0,133.0,134.0" style="Header_Order_Reference_Tbl">
       <tr>
         <td>
@@ -186,20 +200,20 @@
           <para style="terp_default_Centre_8">[[ picking.origin ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]][[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]]</para>
+          <para style="terp_default_Centre_8">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[  formatLang(picking.min_date,date_time = True) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(picking.weight) ]]</para>
+          <para style="terp_default_Centre_8">[[ picking.weight or '']] </para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="255.0,65.0,70.0,83.0,75.0" repeatRows="1" style="Move_Line_Header">
+    <blockTable colWidths="256.0,58.0,61.0,73.0,70.0" repeatRows="1" style="Move_Line_Header">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -208,40 +222,43 @@
           <para style="terp_tblheader_Details_Centre">Lot</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">State</para>
+          <para style="terp_tblheader_Details">State</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Qty</para>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Location</para>
+          <para style="terp_tblheader_Details">Location</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]]</para>
-      <blockTable colWidths="255.0,65.0,70.0,50.0,30.0,75.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">
         <tr>
           <td>
-            <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]]</para>
+            <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </para>
           </td>
           <td>
-            <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or  '' ]]</para>
+            <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ move_lines.state ]]</para>
+            <para style="terp_default_9">[[ move_lines.state ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(move_lines.product_qty) ]]</para>
+            <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ move_lines.product_uom.name ]]</para>
+            <para style="terp_default_9">[[ move_lines.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ (((picking.type == 'out') and move_lines.location_id.name) or  ((picking.type == 'in') and move_lines.location_dest_id.name) or ((picking.type == 'internal') and (move_lines.location_id.name + '-' + move_lines.location_dest_id.name)) or '' ) ]]</para>
+            <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -249,34 +266,30 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_Bold_9">Non Assigned Products: [[ ((line.state == 'assigned') or (line.state == 'done')) and  removeParentNode('para') ]]</para>
-    <para style="terp_default_Bold_9">
-      <font color="white"> </font>
-    </para>
+    <para style="terp_default_5cm_Above_Space">[[ (line.state == 'done' or line.state == 'confirmed') and removeParentNode('para') ]]</para>
+    <para style="terp_default_Bold_9">Non Assigned Products: [[ ( line.state == 'assigned' or line.state == 'done' or line.state == 'confirmed' ) and removeParentNode('para') ]]</para>
+    <para style="terp_default_1cm_above_space">[[ (line.state == 'done' or line.state == 'confirmed') and removeParentNode('para') ]]</para>
     <section>
-      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state !=  'assigned' )],'move_lines') ]]</para>
-      <blockTable colWidths="255.0,65.0,70.0,50.0,30.0,75.0" style="Move_Line_Content_Other_State">
+      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]</para>
+      <blockTable colWidths="257.0,57.0,62.0,46.0,26.0,74.0" style="Move_Line_Content_Other_State">
         <tr>
           <td>
-            <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]]</para>
+            <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or  '' ]]</para>
+            <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ move_lines.state ]]</para>
+            <para style="terp_default_9">[[ move_lines.state ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(move_lines.product_qty) ]]</para>
+            <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ move_lines.product_uom.name ]]</para>
+            <para style="terp_default_9">[[ move_lines.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ (((picking.type == 'out') and move_lines.location_id.name) or  ((picking.type == 'in') and move_lines.location_dest_id.name) or ((picking.type == 'internal') and (move_lines.location_id.name + '-' + move_lines.location_dest_id.name)) or '' ) ]]</para>
+            <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -290,14 +303,5 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>