Merge lp:~vauxoo/addons-vauxoo/7.0-fix-error-font-size-reports-dev_ernesto into lp:addons-vauxoo

[Luis Ernesto García Medina - http://www.vauxoo.com]

se agrego <!DOCTYPE> para evitar problemas con tamaño de letra en los reportes de esta rama

Unmerged revisions

1015. By Luis Ernesto García Medina - http://www.vauxoo.com on 2014-05-12

[FIX][account_aged_partner_balance, account_move_report, ifrs_report, mrp_webkit_report_wizard]I repair error with font size font

=== modified file 'account_advance_payment/i18n/es.po'
--- account_advance_payment/i18n/es.po	2014-01-29 06:05:24 +0000
+++ account_advance_payment/i18n/es.po	2014-05-13 00:34:34 +0000
@@ -13,9 +13,15 @@
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
+<<<<<<< TREE
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
+=======
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_advance_payment
 #: field:res.partner,property_account_customer_advance:0

=== modified file 'account_advance_payment/i18n/es_MX.po'
--- account_advance_payment/i18n/es_MX.po	2014-01-29 06:05:24 +0000
+++ account_advance_payment/i18n/es_MX.po	2014-05-13 00:34:34 +0000
@@ -12,6 +12,7 @@
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
+<<<<<<< TREE
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
@@ -87,3 +88,80 @@
 #: help:res.partner,customer_advance:0
 msgid "Total amount of advance payment of custom."
 msgstr ""
+=======
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_advance_payment
+#: field:res.partner,property_account_customer_advance:0
+msgid "Account Customer Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:res.partner,property_account_supplier_advance:0
+msgid "This account will be used for advance payment of suppliers"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:res.partner,property_account_customer_advance:0
+msgid "This account will be used for advance payment of custom"
+msgstr ""
+
+#. module: account_advance_payment
+#: selection:account.voucher,trans_type:0
+msgid "Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: model:ir.model,name:account_advance_payment.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_advance_payment
+#: field:res.partner,supplier_advance:0
+msgid "Total Supplier Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:res.partner,supplier_advance:0
+msgid "Total amount of advance payment of suppliers."
+msgstr ""
+
+#. module: account_advance_payment
+#: field:account.voucher,trans_type:0
+msgid "Transaction Type"
+msgstr ""
+
+#. module: account_advance_payment
+#: field:res.partner,property_account_supplier_advance:0
+msgid "Account Supplier Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: field:res.partner,customer_advance:0
+msgid "Total Customer Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: selection:account.voucher,trans_type:0
+msgid "Payments"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:account.voucher,trans_type:0
+msgid ""
+"Payments.- Normal payment is made. \n"
+"Advance.- Advance payment of custom or supplier"
+msgstr ""
+
+#. module: account_advance_payment
+#: model:ir.model,name:account_advance_payment.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:res.partner,customer_advance:0
+msgid "Total amount of advance payment of custom."
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== modified file 'account_advance_payment/i18n/es_VE.po'
--- account_advance_payment/i18n/es_VE.po	2014-01-29 06:05:24 +0000
+++ account_advance_payment/i18n/es_VE.po	2014-05-13 00:34:34 +0000
@@ -12,6 +12,7 @@
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
+<<<<<<< TREE
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
@@ -87,3 +88,80 @@
 #: help:res.partner,customer_advance:0
 msgid "Total amount of advance payment of custom."
 msgstr ""
+=======
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_advance_payment
+#: field:res.partner,property_account_customer_advance:0
+msgid "Account Customer Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:res.partner,property_account_supplier_advance:0
+msgid "This account will be used for advance payment of suppliers"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:res.partner,property_account_customer_advance:0
+msgid "This account will be used for advance payment of custom"
+msgstr ""
+
+#. module: account_advance_payment
+#: selection:account.voucher,trans_type:0
+msgid "Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: model:ir.model,name:account_advance_payment.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_advance_payment
+#: field:res.partner,supplier_advance:0
+msgid "Total Supplier Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:res.partner,supplier_advance:0
+msgid "Total amount of advance payment of suppliers."
+msgstr ""
+
+#. module: account_advance_payment
+#: field:account.voucher,trans_type:0
+msgid "Transaction Type"
+msgstr ""
+
+#. module: account_advance_payment
+#: field:res.partner,property_account_supplier_advance:0
+msgid "Account Supplier Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: field:res.partner,customer_advance:0
+msgid "Total Customer Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: selection:account.voucher,trans_type:0
+msgid "Payments"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:account.voucher,trans_type:0
+msgid ""
+"Payments.- Normal payment is made. \n"
+"Advance.- Advance payment of custom or supplier"
+msgstr ""
+
+#. module: account_advance_payment
+#: model:ir.model,name:account_advance_payment.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:res.partner,customer_advance:0
+msgid "Total amount of advance payment of custom."
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== modified file 'account_advance_payment/i18n/pt_BR.po'
--- account_advance_payment/i18n/pt_BR.po	2014-01-29 06:05:24 +0000
+++ account_advance_payment/i18n/pt_BR.po	2014-05-13 00:34:34 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Brazilian Portuguese translation for addons-vauxoo
 # Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
 # This file is distributed under the same license as the addons-vauxoo package.
@@ -88,3 +89,95 @@
 #: help:res.partner,customer_advance:0
 msgid "Total amount of advance payment of custom."
 msgstr ""
+=======
+# Brazilian Portuguese translation for addons-vauxoo
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the addons-vauxoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: addons-vauxoo\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-11-07 01:14+0000\n"
+"PO-Revision-Date: 2013-12-25 16:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_advance_payment
+#: field:res.partner,property_account_customer_advance:0
+msgid "Account Customer Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:res.partner,property_account_supplier_advance:0
+msgid "This account will be used for advance payment of suppliers"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:res.partner,property_account_customer_advance:0
+msgid "This account will be used for advance payment of custom"
+msgstr ""
+
+#. module: account_advance_payment
+#: selection:account.voucher,trans_type:0
+msgid "Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: model:ir.model,name:account_advance_payment.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_advance_payment
+#: field:res.partner,supplier_advance:0
+msgid "Total Supplier Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:res.partner,supplier_advance:0
+msgid "Total amount of advance payment of suppliers."
+msgstr ""
+
+#. module: account_advance_payment
+#: field:account.voucher,trans_type:0
+msgid "Transaction Type"
+msgstr ""
+
+#. module: account_advance_payment
+#: field:res.partner,property_account_supplier_advance:0
+msgid "Account Supplier Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: field:res.partner,customer_advance:0
+msgid "Total Customer Advance"
+msgstr ""
+
+#. module: account_advance_payment
+#: selection:account.voucher,trans_type:0
+msgid "Payments"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:account.voucher,trans_type:0
+msgid ""
+"Payments.- Normal payment is made. \n"
+"Advance.- Advance payment of custom or supplier"
+msgstr ""
+
+#. module: account_advance_payment
+#: model:ir.model,name:account_advance_payment.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: account_advance_payment
+#: help:res.partner,customer_advance:0
+msgid "Total amount of advance payment of custom."
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== modified file 'account_aged_partner_balance_vw/data/data.xml'
--- account_aged_partner_balance_vw/data/data.xml	2013-10-24 23:53:13 +0000
+++ account_aged_partner_balance_vw/data/data.xml	2014-05-13 00:34:34 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 <?xml version="1.0" ?>
 <openerp>
     <data noupdate="0">
@@ -182,3 +183,189 @@
 
     </data>
 </openerp>
+=======
+<?xml version="1.0" ?>
+<openerp>
+    <data noupdate="0">
+    <record id="ir_header_webkit_account_aged_partner_balance_report" model="ir.header_webkit">
+        <field name="footer_html"><![CDATA[<!DOCTYPE><html>
+    <head>
+        <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+        <script>
+            function subst() {
+            var vars={};
+            var x=document.location.search.substring(1).split('&');
+            for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+            var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+            for(var i in x) {
+            var y = document.getElementsByClassName(x[i]);
+            for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+                }
+            }
+        </script>
+    </head>
+    <body style="border:0; margin: 0;" onload="subst()">
+        <table style="border-top: 1px solid black; width: 100%">
+            <tr >
+                <td style="float:right;text-align:left;font-size:12;" width="30%">
+                   <script type="text/javascript">
+                        var date = new Date();
+                        var d  = date.getDate();
+                        var day = (d < 10) ? '0' + d : d;
+                        var m = date.getMonth() + 1;
+                        var month = (m < 10) ? '0' + m : m;
+                        var yy = date.getYear();
+                        var year = (yy < 1000) ? yy + 1900 : yy;
+                        var h = date.getHours();
+                        var hours = (h < 10) ? '0' + h : h;
+                        var mm = date.getMinutes();
+                        var minutes = (mm < 10) ? '0' + mm : mm;
+                        document.write(day + "/" + month + "/" + year + 
+                                      "\t\t" + hours+":" + minutes );
+                        </script>
+                </td>
+                <td style="text-align:right;font-size:12;" width="65%">Page <span class="page"/></td><td style="text-align:left;font-size:12;">  of <span class="topage"/></td>
+            </tr>
+        </table>
+    </body>
+</html>]]></field>
+        <field name="orientation">Landscape</field>
+        <field name="format">Letter</field>
+        <field name="html">
+            <![CDATA[<!DOCTYPE><html>
+                <head>
+                    <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+                    <script>
+                        function subst() {
+                        var vars={};
+                        var x=document.location.search.substring(1).split('&');
+                        for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+                        var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+                        for(var i in x) {
+                        var y = document.getElementsByClassName(x[i]);
+                        for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+                            }
+                        }
+                    </script>
+                    <style type="text/css">
+                        ${css}
+                    </style>
+                </head>
+                <body style="border:0; margin: 0;" onload="subst()">
+             ${_debug or ''|n} </body>
+            </html>]]>
+    </field>
+        <field name="css">
+<![CDATA[
+table.basic_table{ 
+text-align:left; 
+border:1px solid lightGrey; 
+border-collapse: collapse; 
+}
+ 
+.dest_address { font-size:12pt; 
+margin-left:0; 
+text-align:left; l
+ine-height:80%; 
+padding-top:0px 
+} 
+
+.prueba{ 
+color:black; 
+background-color:#dcdcdc;
+} 
+
+.celdaTotalTitulo{ 
+font-size:11pt; 
+text-align:left; 
+font-weight:bold; 
+font-family:Arial,Helvetica,sans-serif; 
+background-color:#dcdcdc; 
+} 
+
+.celdaBoxUp{ 
+font-size:9pt; 
+font-family:Arial,Helvetica,sans-serif; 
+text-align:right; 
+background-color:#F5F5F5; 
+} 
+
+.celdaTotal{ 
+font-size:7pt; 
+font-family: monospace; 
+text-align:right; 
+font-weight:bold; 
+background-color:#EAEAEA; 
+} 
+
+.celdaTotalTotales{ 
+font-size:7pt; 
+font-family: monospace; 
+text-align:right; 
+font-weight:bold; 
+background-color:#EAEAEA; 
+} 
+
+.celdaLineDataTitulo{ 
+font-style:italic; 
+font-size:7pt; 
+text-align:left; 
+font-family:Arial,Helvetica,sans-serif; 
+background-color:#F5F5F5; 
+} 
+
+.celdaLineData{ 
+font-size:7pt; 
+font-family: monospace; 
+text-align:right; 
+background-color:#F5F5F5; 
+} 
+
+.celdaTituloTabla{ 
+font-size:8pt; 
+text-align:left; 
+font-family:Arial,Helvetica,sans-serif; 
+background-color:#620400; 
+font-weight:bold;
+color:#FFFFFF; 
+}
+
+.celdaTituloPartner{ 
+font-size:8pt; 
+text-align:left; 
+font-family:Arial,Helvetica,sans-serif; 
+background-color:#CDCDCD; 
+font-weight:bold;
+}
+
+.celdaTituloTablaCompany{ 
+font-size:11pt; 
+text-align:left; 
+font-family:Arial,Helvetica,sans-serif; 
+background-color:#620400; 
+color:#FFFFFF; 
+}
+
+.celdaTituloTablaUser{ 
+font-size:10pt; 
+text-align:left; 
+font-family:Arial,Helvetica,sans-serif; 
+color:#FFFFFF; 
+}
+
+.celdaGrandTotal{ 
+font-size:7pt; 
+font-family: monospace; 
+text-align:right; 
+font-weight:bold;
+color:#FFFFFF;
+background-color:#000000; 
+}
+]]>
+</field>
+            <field name="name">Report Account Aged Partner Balance VW</field>
+        </record>
+
+    </data>
+</openerp>
+>>>>>>> MERGE-SOURCE

=== modified file 'account_aged_partner_balance_vw/i18n/es.po'
--- account_aged_partner_balance_vw/i18n/es.po	2014-01-29 06:05:24 +0000
+++ account_aged_partner_balance_vw/i18n/es.po	2014-05-13 00:34:34 +0000
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
 
@@ -70,6 +71,64 @@
 #: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:195
 #: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:372
 msgid "Not Due"
+=======
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:66
+#: view:wizard.report.aged.partner.balance:0
+#: field:wizard.report.aged.partner.balance,partner_ids:0
+msgid "Partners"
+msgstr "Partners"
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid "Partners with movements"
+msgstr "Partners con movimientos"
+
+#. module: account_aged_partner_balance_vw
+#: field:wizard.report.aged.partner.balance,partner_ids_default:0
+msgid "Partners Default"
+msgstr "Partners por Default"
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.trial.balance:0
+msgid "Aged Report"
+msgstr "Informe de Antiguedad"
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,type:0
+msgid "Documents spread in Periods"
+msgstr "Documentos expedidos en periodos"
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid "Partners default to show in Report"
+msgstr "Partners por default a mostrar en el reporte"
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:20
+msgid "Period Length(days)"
+msgstr "Duración Periodo(días)"
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.model,name:account_aged_partner_balance_vw.model_account_aged_partner_document
+msgid "account.aged.partner.document"
+msgstr "account.aged.partner.document"
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.actions.wizard,name:account_aged_partner_balance_vw.wizard_open_move_line
+msgid "Open Moves Lines"
+msgstr "Lineas Mov abiertos"
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.balance.vw,not_due:0
+#: field:account.aged.partner.document,not_due:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:195
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:372
+msgid "Not Due"
+>>>>>>> MERGE-SOURCE
 msgstr "No Vencido"
 
 #. module: account_aged_partner_balance_vw

=== modified file 'account_aged_partner_balance_vw/i18n/es_MX.po'
--- account_aged_partner_balance_vw/i18n/es_MX.po	2014-01-29 06:05:24 +0000
+++ account_aged_partner_balance_vw/i18n/es_MX.po	2014-05-13 00:34:34 +0000
@@ -13,6 +13,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
 
@@ -454,3 +455,446 @@
 #: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:46
 msgid "All Entries"
 msgstr ""
+=======
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:66
+#: view:wizard.report.aged.partner.balance:0
+#: field:wizard.report.aged.partner.balance,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid "Partners with movements"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:wizard.report.aged.partner.balance,partner_ids_default:0
+msgid "Partners Default"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.trial.balance:0
+msgid "Aged Report"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,type:0
+msgid "Documents spread in Periods"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid "Partners default to show in Report"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:20
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.model,name:account_aged_partner_balance_vw.model_account_aged_partner_document
+msgid "account.aged.partner.document"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.actions.wizard,name:account_aged_partner_balance_vw.wizard_open_move_line
+msgid "Open Moves Lines"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.balance.vw,not_due:0
+#: field:account.aged.partner.document,not_due:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:195
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:372
+msgid "Not Due"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: field:account.aged.partner.balance.vw,days_due_121togr:0
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,days_due_121togr:0
+msgid "+121"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:wizard.report.aged.partner.balance,group_user:0
+msgid "Group by User"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:wizard.report.aged.partner.balance,show_aml:0
+msgid "In the report was show the journal entries"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,state:0
+msgid "New"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.trial.balance:0
+#: view:wizard.report.aged.partner.balance:0
+msgid "Print"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.trial.balance:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.document,document_id:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:193
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:370
+msgid "Document"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:17
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:wizard.report.aged.partner.balance,show_aml:0
+msgid "Show Journal Entries"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.trial.balance,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.document,date_due:0
+#: help:account.aged.partner.document,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.document,due_days:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:196
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:373
+msgid "Due Days"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.model,name:account_aged_partner_balance_vw.model_wizard_report_aged_partner_balance
+msgid "wizard.report.aged.partner.balance"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:account.aged.trial.balance,type:0
+msgid "Reporte Type"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.balance.vw,company_id:0
+#: field:account.aged.partner.document,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.document:0
+msgid "Aged Partner Document"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.actions.act_window,name:account_aged_partner_balance_vw.action_expense_report_tree
+msgid "Expense Company"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: field:account.aged.partner.balance.vw,days_due_01to30:0
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,days_due_01to30:0
+msgid "01/30"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: model:ir.actions.act_window,name:account_aged_partner_balance_vw.action_account_aged_partner_balance_vw
+#: model:ir.ui.menu,name:account_aged_partner_balance_vw.menu_action_account_aged_partner_balance_vw
+msgid "Aged Partner Balance View"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.balance.vw,currency_company_id:0
+#: field:account.aged.partner.document,currency_company_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.document,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:account.aged.partner.document,user_id:0
+msgid "User's Document"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.trial.balance:0
+msgid "Back to Start"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: field:account.aged.partner.balance.vw,days_due_91to120:0
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,days_due_91to120:0
+msgid "91/120"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:23
+msgid "Target Moves"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:36
+msgid "Receivable and Payable Accounts"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:wizard.report.aged.partner.balance,group_user:0
+msgid "¿Group report by user?"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid "Vouchers Partner"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: field:account.aged.partner.balance.vw,days_due_61to90:0
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,days_due_61to90:0
+msgid "61/90"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,type:0
+msgid "Balance Variation in Periods"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.model,name:account_aged_partner_balance_vw.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:44
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.actions.report.xml,name:account_aged_partner_balance_vw.account_aged_partner_balance_report
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:account.aged.trial.balance,state:0
+msgid "Document State"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:22
+msgid "Analysis Direction"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.balance.vw,aatb_id:0
+#: field:account.aged.partner.document,aatb_id:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:303
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:493
+msgid "Grand Total"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:18
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:41
+msgid "Future"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid ""
+"Select the partners to show in report, if this field is empty will take all "
+"partners"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,residual:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:197
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:374
+msgid "Residual"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+#: help:wizard.report.aged.partner.balance,partner_ids:0
+msgid "Partners to show in Report"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.trial.balance,type:0
+msgid "Type of Report"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:account.aged.partner.balance.vw,aatb_id:0
+#: help:account.aged.partner.document,aatb_id:0
+msgid "Aged Trail Balance Document"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.model,name:account_aged_partner_balance_vw.model_account_aged_partner_balance_vw
+msgid "account.aged.partner.balance.vw"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:194
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:371
+msgid "Type"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,type:0
+msgid "Distributed Payments over Debts"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:wizard.report.aged.partner.balance,partner_ids_default:0
+msgid "Partners to show in Report by default"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:32
+msgid "Receivable Accounts"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.trial.balance,partner_doc_ids:0
+#: help:account.aged.trial.balance,partner_doc_ids:0
+#: field:account.aged.trial.balance,partner_line_ids:0
+#: help:account.aged.trial.balance,partner_line_ids:0
+msgid "Partner Aged Trail Balance"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:34
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: field:account.aged.partner.balance.vw,days_due_31to60:0
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,days_due_31to60:0
+msgid "31/60"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:39
+msgid "Past"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:21
+msgid "Partners "
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: view:account.aged.partner.document:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:67
+msgid "Not due"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.partner.document,document_id:0
+msgid "Journal Entry Line"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.partner.document,document_id:0
+msgid "Voucher"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.partner.document,document_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.trial.balance,wizard_ids:0
+#: field:wizard.report.aged.partner.balance,aged_trial_report_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.balance.vw,partner_id:0
+#: field:account.aged.partner.document,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:19
+msgid "Start Date"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: field:account.aged.partner.balance.vw,total:0
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,total:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:72
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:116
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:262
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:450
+msgid "Total"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,state:0
+msgid "Open"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid "or"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:46
+msgid "All Entries"
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== modified file 'account_aged_partner_balance_vw/i18n/es_VE.po'
--- account_aged_partner_balance_vw/i18n/es_VE.po	2014-01-29 06:05:24 +0000
+++ account_aged_partner_balance_vw/i18n/es_VE.po	2014-05-13 00:34:34 +0000
@@ -13,6 +13,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
 
@@ -454,3 +455,446 @@
 #: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:46
 msgid "All Entries"
 msgstr ""
+=======
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:66
+#: view:wizard.report.aged.partner.balance:0
+#: field:wizard.report.aged.partner.balance,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid "Partners with movements"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:wizard.report.aged.partner.balance,partner_ids_default:0
+msgid "Partners Default"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.trial.balance:0
+msgid "Aged Report"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,type:0
+msgid "Documents spread in Periods"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid "Partners default to show in Report"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:20
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.model,name:account_aged_partner_balance_vw.model_account_aged_partner_document
+msgid "account.aged.partner.document"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.actions.wizard,name:account_aged_partner_balance_vw.wizard_open_move_line
+msgid "Open Moves Lines"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.balance.vw,not_due:0
+#: field:account.aged.partner.document,not_due:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:195
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:372
+msgid "Not Due"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: field:account.aged.partner.balance.vw,days_due_121togr:0
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,days_due_121togr:0
+msgid "+121"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:wizard.report.aged.partner.balance,group_user:0
+msgid "Group by User"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:wizard.report.aged.partner.balance,show_aml:0
+msgid "In the report was show the journal entries"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,state:0
+msgid "New"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.trial.balance:0
+#: view:wizard.report.aged.partner.balance:0
+msgid "Print"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.trial.balance:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.document,document_id:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:193
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:370
+msgid "Document"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:17
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:wizard.report.aged.partner.balance,show_aml:0
+msgid "Show Journal Entries"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.trial.balance,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.document,date_due:0
+#: help:account.aged.partner.document,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.document,due_days:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:196
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:373
+msgid "Due Days"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.model,name:account_aged_partner_balance_vw.model_wizard_report_aged_partner_balance
+msgid "wizard.report.aged.partner.balance"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:account.aged.trial.balance,type:0
+msgid "Reporte Type"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.balance.vw,company_id:0
+#: field:account.aged.partner.document,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.document:0
+msgid "Aged Partner Document"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.actions.act_window,name:account_aged_partner_balance_vw.action_expense_report_tree
+msgid "Expense Company"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: field:account.aged.partner.balance.vw,days_due_01to30:0
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,days_due_01to30:0
+msgid "01/30"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: model:ir.actions.act_window,name:account_aged_partner_balance_vw.action_account_aged_partner_balance_vw
+#: model:ir.ui.menu,name:account_aged_partner_balance_vw.menu_action_account_aged_partner_balance_vw
+msgid "Aged Partner Balance View"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.balance.vw,currency_company_id:0
+#: field:account.aged.partner.document,currency_company_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.document,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:account.aged.partner.document,user_id:0
+msgid "User's Document"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.trial.balance:0
+msgid "Back to Start"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: field:account.aged.partner.balance.vw,days_due_91to120:0
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,days_due_91to120:0
+msgid "91/120"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:23
+msgid "Target Moves"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:36
+msgid "Receivable and Payable Accounts"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:wizard.report.aged.partner.balance,group_user:0
+msgid "¿Group report by user?"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid "Vouchers Partner"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: field:account.aged.partner.balance.vw,days_due_61to90:0
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,days_due_61to90:0
+msgid "61/90"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,type:0
+msgid "Balance Variation in Periods"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.model,name:account_aged_partner_balance_vw.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:44
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.actions.report.xml,name:account_aged_partner_balance_vw.account_aged_partner_balance_report
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:account.aged.trial.balance,state:0
+msgid "Document State"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:22
+msgid "Analysis Direction"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.balance.vw,aatb_id:0
+#: field:account.aged.partner.document,aatb_id:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:303
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:493
+msgid "Grand Total"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:18
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:41
+msgid "Future"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid ""
+"Select the partners to show in report, if this field is empty will take all "
+"partners"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,residual:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:197
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:374
+msgid "Residual"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+#: help:wizard.report.aged.partner.balance,partner_ids:0
+msgid "Partners to show in Report"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.trial.balance,type:0
+msgid "Type of Report"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:account.aged.partner.balance.vw,aatb_id:0
+#: help:account.aged.partner.document,aatb_id:0
+msgid "Aged Trail Balance Document"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: model:ir.model,name:account_aged_partner_balance_vw.model_account_aged_partner_balance_vw
+msgid "account.aged.partner.balance.vw"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:194
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:371
+msgid "Type"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,type:0
+msgid "Distributed Payments over Debts"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: help:wizard.report.aged.partner.balance,partner_ids_default:0
+msgid "Partners to show in Report by default"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:32
+msgid "Receivable Accounts"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.trial.balance,partner_doc_ids:0
+#: help:account.aged.trial.balance,partner_doc_ids:0
+#: field:account.aged.trial.balance,partner_line_ids:0
+#: help:account.aged.trial.balance,partner_line_ids:0
+msgid "Partner Aged Trail Balance"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:34
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: field:account.aged.partner.balance.vw,days_due_31to60:0
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,days_due_31to60:0
+msgid "31/60"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:39
+msgid "Past"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:21
+msgid "Partners "
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: view:account.aged.partner.document:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:67
+msgid "Not due"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.partner.document,document_id:0
+msgid "Journal Entry Line"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.partner.document,document_id:0
+msgid "Voucher"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.partner.document,document_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.trial.balance,wizard_ids:0
+#: field:wizard.report.aged.partner.balance,aged_trial_report_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: field:account.aged.partner.balance.vw,partner_id:0
+#: field:account.aged.partner.document,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:19
+msgid "Start Date"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:account.aged.partner.balance.vw:0
+#: field:account.aged.partner.balance.vw,total:0
+#: view:account.aged.partner.document:0
+#: field:account.aged.partner.document,total:0
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:72
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:116
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:262
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:450
+msgid "Total"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: selection:account.aged.trial.balance,state:0
+msgid "Open"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: view:wizard.report.aged.partner.balance:0
+msgid "or"
+msgstr ""
+
+#. module: account_aged_partner_balance_vw
+#: report:addons/account_aged_partner_balance_vw/report/account_aged_partner_balance.mako:46
+msgid "All Entries"
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== modified file 'account_aged_partner_balance_vw/report/account_aged_partner_balance.mako'
--- account_aged_partner_balance_vw/report/account_aged_partner_balance.mako	2013-10-24 23:53:13 +0000
+++ account_aged_partner_balance_vw/report/account_aged_partner_balance.mako	2014-05-13 00:34:34 +0000
@@ -1,524 +1,1052 @@
-<html>
-    <head>
-        <style type="text/css">
-            ${css}
-        </style>
-    </head>
-    <body style="border:0; margin: 0;" onload="subst()" >
-        %for obj in objects :
-            <table>
-                <tr>
-                    <td width="10%">
-                        <div>${helper.embed_image('jpeg',str(obj.company_id.logo),220, 100)}</div>
-                    </td>
-                    <td>
-                        <table style="width: 100%; text-align:center;">
-                            <tr>
-                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Chart of Accounts')}</th>
-                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Fiscal Year')}</th>
-                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Start Date')}</th>
-                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Period Length(days)')}</th>
-                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Partners ')}</th>
-                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Analysis Direction')}</th>
-                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Target Moves')}</th>
-                            </tr>
-                            <tr>
-                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${obj.chart_account_id.name or ''|entity}</th>
-                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${obj.fiscalyear_id.name or ''|entity}</th>
-                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${obj.date_from or ''|entity}</th>
-                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${obj.period_length or ''|entity}</th>
-                                
-                                %if obj.result_selection == 'customer':
-                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Receivable Accounts')}</th>
-                                    %elif obj.result_selection == 'supplier':
-                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Payable Accounts')}</th>
-                                    %elif obj.result_selection == 'customer_suppiler':
-                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Receivable and Payable Accounts')}</th>
-                                %endif
-                                %if obj.direction_selection == 'past':
-                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Past')}</th>
-                                    %elif obj.direction_selection == 'future':
-                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Future')}</th>
-                                %endif
-                                %if obj.target_move == 'posted':
-                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('All Posted Entries')}</th>
-                                    %elif obj.target_move == 'all':
-                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('All Entries')}</th>
-                                %endif
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
-            </table>
-            <br clear="all"/>
-            
-            <table class="list_table"  width="100%" border="0">
-                <thead>
-                    <tr>
-                        <th class="celdaTituloTablaCompany" width="100%">${obj.company_id.name or ''|entity} (Expressed in ${obj.company_id.currency_id.name |entity} )</th>
-                    </tr>
-                </thead>
-            </table>
-            %if obj.type != "by_document":
-                <table class="list_table"  width="100%" border="0">
-                    <thead>
-                        <tr>
-                            <th class="celdaTituloTabla" style="text-align:center;" width="30%">${_('Partners')}</th>
-                            <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Not due')}</th>
-                            <% form = data['form']%>
-                            %for i in range (4,-1,-1):
-                                <th class="celdaTituloTabla" style="text-align:center;">${form.get('%i'%i).get('name')}</th>
-                            %endfor
-                            <th class="celdaTituloTabla" style="text-align:center;">${_('Total')}</th>
-                        </tr>
-                    </thead>
-                     
-                    <tbody>
-                        <%tot_not_due = tot_01to30 = tot_31to60 = tot_61to90 = tot_91to120 = tot_121togr = tot_total = 0%>
-                        %for line in obj.partner_line_ids:
-                            <tr class="prueba" >
-                                <td class="celdaLineDataTitulo" width="30%">
-                                    ${line.partner_id.name.upper()}
-                                </td>
-                                <td class="celdaLineData" width="10%">
-                                    ${line.not_due}
-                                </td>
-                                <td class="celdaLineData" width="10%">
-                                    ${line.days_due_01to30}
-                                </td>
-                                <td class="celdaLineData" width="10%">
-                                    ${line.days_due_31to60}
-                                </td>
-                                <td class="celdaLineData" width="10%">
-                                    ${line.days_due_61to90}
-                                </td>
-                                <td class="celdaLineData" width="10%">
-                                    ${line.days_due_91to120}
-                                </td>
-                                <td class="celdaLineData" width="10%">
-                                    ${line.days_due_121togr}
-                                </td>
-                                <td class="celdaTotal" width="10%">
-                                    ${line.total}
-                                </td>
-                            </tr>
-                            <%
-                            tot_not_due += line.not_due
-                            tot_01to30 += line.days_due_01to30
-                            tot_31to60 += line.days_due_31to60
-                            tot_61to90 += line.days_due_61to90
-                            tot_91to120 += line.days_due_91to120
-                            tot_121togr += line.days_due_121togr
-                            tot_total += line.total
-                            %>
-                        %endfor
-                        <tr class="prueba">
-                                <td class="celdaGrandTotal" width="30%">${_('Total')}</td>
-                                <td class="celdaGrandTotal" width="10%">
-                                    ${tot_not_due}
-                                </td>
-                                <td class="celdaGrandTotal" width="10%">
-                                    ${tot_01to30}
-                                </td>
-                                <td class="celdaGrandTotal" width="10%">
-                                    ${tot_31to60}
-                                </td>
-                                <td class="celdaGrandTotal" width="10%">
-                                    ${tot_61to90}
-                                </td>
-                                <td class="celdaGrandTotal" width="10%">
-                                    ${tot_91to120}
-                                </td>
-                                <td class="celdaGrandTotal" width="10%">
-                                    ${tot_121togr}
-                                </td>
-                                <td class="celdaGrandTotal" width="10%">
-                                    ${tot_total}
-                                </td>
-                            </tr>
-                    </tbody>
-                </table>
-            %endif
-            <%
-            group_user = True
-            show_aml = True
-            partner_ids = []
-            for wiz in obj.wizard_ids:
-                group_user = wiz.group_user
-                show_aml = wiz.show_aml
-                partner_ids = wiz.partner_ids and [x.id for x in wiz.partner_ids] or wiz.partner_ids_default and [x.id for x in wiz.partner_ids_default] or []
-                
-            def get_dict_lines_by_partner(lines):
-                dic_partner_lines = {}
-                for line in lines:
-                    if line.partner_id.id in partner_ids and line.partner_id.id:
-                        doc = line.document_id
-                        partner_name = line.partner_id.vat_split and line.partner_id.vat_split + ' - ' + line.partner_id.name or line.partner_id.name
-                        if show_aml or (not show_aml and doc._name != 'account.move.line'):
-                            if not group_user:
-                                if partner_name in dic_partner_lines:
-                                    dic_partner_lines.get(partner_name).append(line)
-                                else:   
-                                    dic_partner_lines.update({partner_name : [line]})
-                            else:
-                                user_id = doc._name == 'account.invoice' and doc.user_id and doc.user_id.name or doc.partner_id and doc.partner_id.user_id and doc.partner_id.user_id.name or "Not User"
-                                if user_id in dic_partner_lines:
-                                    dict_user = dic_partner_lines.get(user_id)
-                                    if partner_name in dict_user:
-                                        dic_partner_lines.get(user_id).get(partner_name).append(line)
-                                    else:   
-                                        dic_partner_lines.get(user_id).update({partner_name : [line]})
-                                else:   
-                                    dic_partner_lines.update({user_id : {partner_name : [line]}})
-                return dic_partner_lines
-            %>
-            %if obj.type == "by_document":
-                %if not group_user:
-                    <%tot_not_due = tot_01to30 = tot_31to60 = tot_61to90 = tot_91to120 = tot_121togr = tot_residual= 0%>
-                    %for partner in get_dict_lines_by_partner(obj.partner_doc_ids):
-                        <%
-                        lines_partner = get_dict_lines_by_partner(obj.partner_doc_ids).get(partner, False)
-                        %>
-                        %if lines_partner:
-                            <table class="list_table"  width="100%" border="0">
-                                <thead>
-                                    <tr>
-                                        <th class="celdaTituloPartner" style="text-align:left;" width="10%">${partner}</th>
-                                    </tr>
-                                </thead>
-                            </table>
-                            <table class="list_table"  width="100%" border="0">
-                                <thead>
-                                    <tr>
-                                        <th class="celdaTituloTabla" style="text-align:left;" width="20%">${_('Document')}</th>
-                                        <th class="celdaTituloTabla" style="text-align:left;" width="10%">${_('Type')}</th>
-                                        <th class="celdaTituloTabla" style="text-align:left;" width="6%">${_('Not Due')}</th>
-                                        <th class="celdaTituloTabla" style="text-align:left;" width="6%">${_('Due Days')}</th>
-                                        <th class="celdaTituloTabla" style="text-align:left;" width="8%">${_('Residual')}</th>
-                                        <% form = data['form']%>
-                                        %for i in range (4,-1,-1):
-                                            <th class="celdaTituloTabla" style="text-align:center;">${form.get('%i'%i).get('name')}</th>
-                                        %endfor
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <%to0130 = to3160 = to6190 = to91120 = to121 = residual = to_not_due = 0%>
-                                    %for line in lines_partner:
-                                        <%
-                                        type = ''
-                                        document = ''
-                                        if line.document_id._name == 'account.invoice':
-                                            document = line.document_id.number
-                                            type = 'Invoice'
-                                        elif line.document_id._name == 'account.voucher':
-                                            type = 'Voucher'
-                                            document = line.document_id.number
-                                        elif line.document_id._name == 'account.move.line':
-                                            type = 'Journal Entry Line'
-                                            document = line.document_id.name
-                                        to_not_due += line.not_due
-                                        to0130 += line.days_due_01to30
-                                        to3160 += line.days_due_31to60
-                                        to6190 += line.days_due_61to90
-                                        to91120 += line.days_due_91to120
-                                        to121 += line.days_due_121togr
-                                        residual += line.residual
-                                        %>
-                                        <tr class="prueba" >
-                                            <td class="celdaLineDataTitulo" width="20%">
-                                                ${document}
-                                            </td>
-                                            <td class="celdaLineData" width="10%">
-                                                ${type}
-                                            </td>
-                                            <td class="celdaLineData" style="text-align:center;" width="6%">
-                                                ${line.not_due}
-                                            </td>
-                                            <td class="celdaLineData" style="text-align:center;" width="6%">
-                                                ${line.due_days}
-                                            </td>
-                                            <td class="celdaLineData" width="8%">
-                                                ${line.residual}
-                                            </td>
-                                            <td class="celdaLineData" width="10%">
-                                                ${line.days_due_01to30}
-                                            </td>
-                                            <td class="celdaLineData" width="10%">
-                                                ${line.days_due_31to60}
-                                            </td>
-                                            <td class="celdaLineData" width="10%">
-                                                ${line.days_due_61to90}
-                                            </td>
-                                            <td class="celdaLineData" width="10%">
-                                                ${line.days_due_91to120}
-                                            </td>
-                                            <td class="celdaLineData" width="10%">
-                                                ${line.days_due_121togr}
-                                            </td>
-                                        </tr>
-                                    %endfor
-                                    <tr>
-                                        <td class="celdaTotalTotales" width="20%">
-                                            ${_('Total')}
-                                        </td>
-                                        <td class="celdaTotalTotales" width="10%"></td>
-                                        <td class="celdaTotalTotales" style="text-align:center;" width="6%">
-                                            ${formatLang(to_not_due, digits=2, grouping=True)}
-                                        </td>
-                                        <td class="celdaTotalTotales" style="text-align:center;" width="6%"></td>
-                                        <td class="celdaTotalTotales" width="8%">
-                                            ${formatLang(residual, digits=2, grouping=True)}
-                                        </td>
-                                        <td class="celdaTotalTotales" width="10%">
-                                            ${formatLang(to0130, digits=2, grouping=True)}
-                                        </td>
-                                        <td class="celdaTotalTotales" width="10%">
-                                            ${formatLang(to3160, digits=2, grouping=True)}
-                                        </td>
-                                        <td class="celdaTotalTotales" width="10%">
-                                            ${formatLang(to6190, digits=2, grouping=True)}
-                                        </td>
-                                        <td class="celdaTotalTotales" width="10%">
-                                            ${formatLang(to91120, digits=2, grouping=True)}
-                                        </td>
-                                        <td class="celdaTotalTotales" width="10%">
-                                            ${formatLang(to121, digits=2, grouping=True)}
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                            <%
-                            tot_residual += residual
-                            tot_not_due += to_not_due
-                            tot_01to30 += to0130
-                            tot_31to60 += to3160
-                            tot_61to90 += to6190
-                            tot_91to120 += to91120
-                            tot_121togr += to121%>
-                        %endif
-                    %endfor
-                    <table width="100%" border="0">
-                        <tr class="prueba" >
-                            <td class="celdaGrandTotal" width="20%">
-                                ${_('Grand Total')}
-                            </td>
-                            <td class="celdaGrandTotal" width="10%"></td>
-                            <td class="celdaGrandTotal" style="text-align:center;" width="6%">
-                                ${formatLang(tot_not_due, digits=2, grouping=True)}
-                            </td>
-                            <td class="celdaGrandTotal" style="text-align:center;" width="6%"></td>
-                            <td class="celdaGrandTotal" width="8%">
-                                ${formatLang(tot_residual, digits=2, grouping=True)}
-                            </td>
-                            <td class="celdaGrandTotal" width="10%">
-                                ${formatLang(tot_01to30, digits=2, grouping=True)}
-                            </td>
-                            <td class="celdaGrandTotal" width="10%">
-                                ${formatLang(tot_31to60, digits=2, grouping=True)}
-                            </td>
-                            <td class="celdaGrandTotal" width="10%">
-                                ${formatLang(tot_61to90, digits=2, grouping=True)}
-                            </td>
-                            <td class="celdaGrandTotal" width="10%">
-                                ${formatLang(tot_91to120, digits=2, grouping=True)}
-                            </td>
-                            <td class="celdaGrandTotal" width="10%">
-                                ${formatLang(tot_121togr, digits=2, grouping=True)}
-                            </td>
-                        </tr>
-                    </table>
-                %else:
-                    <%ban = 1%>
-                    <%tot_not_due = tot_01to30 = tot_31to60 = tot_61to90 = tot_91to120 = tot_121togr = tot_residual= 0%>
-                    %for user in get_dict_lines_by_partner(obj.partner_doc_ids):
-                        <table class="list_table"  width="100%" border="0">
-                            <thead>
-                                <tr>
-                                    %if ban % 2 == 0:
-                                        <th class="celdaTituloTablaUser" bgcolor="#DF013A" style="text-align:left;" width="10%">${user}</th>
-                                    %else:
-                                        <th class="celdaTituloTablaUser" bgcolor="#0174DF" style="text-align:left;" width="10%">${user}</th>
-                                    %endif
-                                </tr>
-                            </thead>
-                        </table>
-                        %for partner in get_dict_lines_by_partner(obj.partner_doc_ids).get(user, False):
-                            <%
-                            lines_partner = get_dict_lines_by_partner(obj.partner_doc_ids).get(user).get(partner, False)
-                            %>
-                            %if lines_partner:
-                                <table class="table_user"  width="100%" border="0">
-                                    <thead>
-                                        <tr>
-                                            %if ban % 2 == 0:
-                                                <th style="text-align:left;" bgcolor="#DF013A" width="0.5%"></th>
-                                            %else:
-                                                <th style="text-align:left;" bgcolor="#0174DF" width="0.5%"></th>
-                                            %endif
-                                            <th class="celdaTituloPartner" style="text-align:left;" width="0.5%">${partner}</th>
-                                        </tr>
-                                    </thead>
-                                </table>
-                                <table class="list_table"  width="100%" border="0">
-                                    <thead>
-                                        <tr>
-                                            %if ban % 2 == 0:
-                                                <th style="text-align:left;" bgcolor="#DF013A" width="0.5%"></th>
-                                            %else:
-                                                <th style="text-align:left;" bgcolor="#0174DF" width="0.5%"></th>
-                                            %endif
-                                            <th class="celdaTituloTabla" style="text-align:left;" width="19.5%">${_('Document')}</th>
-                                            <th class="celdaTituloTabla" style="text-align:left;" width="10%">${_('Type')}</th>
-                                            <th class="celdaTituloTabla" style="text-align:left;" width="6%">${_('Not Due')}</th>
-                                            <th class="celdaTituloTabla" style="text-align:left;" width="6%">${_('Due Days')}</th>
-                                            <th class="celdaTituloTabla" style="text-align:left;" width="8%">${_('Residual')}</th>
-                                            <% form = data['form']%>
-                                            %for i in range (4,-1,-1):
-                                                <th class="celdaTituloTabla" style="text-align:center;">${form.get('%i'%i).get('name')}</th>
-                                            %endfor
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <%
-                                        to0130 = to3160 = to6190 = to91120 = to121 = residual = to_not_due = 0%>
-                                        %for line in lines_partner:
-                                            <%
-                                            type = ''
-                                            document = ''
-                                            if line.document_id._name == 'account.invoice':
-                                                document = line.document_id.number
-                                                type = 'Invoice'
-                                            elif line.document_id._name == 'account.voucher':
-                                                type = 'Voucher'
-                                                document = line.document_id.number
-                                            elif line.document_id._name == 'account.move.line':
-                                                type = 'Journal Entry Line'
-                                                document = line.document_id.name
-                                            to0130 += line.days_due_01to30
-                                            to3160 += line.days_due_31to60
-                                            to6190 += line.days_due_61to90
-                                            to91120 += line.days_due_91to120
-                                            to121 += line.days_due_121togr
-                                            residual += line.residual
-                                            to_not_due += line.not_due
-                                            %>
-                                            <tr class="prueba" >
-                                                %if ban % 2 == 0:
-                                                    <th style="text-align:left;" bgcolor="#DF013A" width="0.5%"></th>
-                                                %else:
-                                                    <th style="text-align:left;" bgcolor="#0174DF" width="0.5%"></th>
-                                                %endif
-                                                <td class="celdaLineDataTitulo" width="19.5%">
-                                                    ${document}
-                                                </td>
-                                                <td class="celdaLineData" width="10%">
-                                                    ${type}
-                                                </td>
-                                                <td class="celdaLineData" style="text-align:center;" width="6%">
-                                                    ${line.not_due}
-                                                </td>
-                                                <td class="celdaLineData" style="text-align:center;" width="6%">
-                                                    ${line.due_days}
-                                                </td>
-                                                <td class="celdaLineData" width="8%">
-                                                    ${line.residual}
-                                                </td>
-                                                <td class="celdaLineData" width="10%">
-                                                    ${line.days_due_01to30}
-                                                </td>
-                                                <td class="celdaLineData" width="10%">
-                                                    ${line.days_due_31to60}
-                                                </td>
-                                                <td class="celdaLineData" width="10%">
-                                                    ${line.days_due_61to90}
-                                                </td>
-                                                <td class="celdaLineData" width="10%">
-                                                    ${line.days_due_91to120}
-                                                </td>
-                                                <td class="celdaLineData" width="10%">
-                                                    ${line.days_due_121togr}
-                                                </td>
-                                            </tr>
-                                        %endfor
-                                        <tr>
-                                            %if ban % 2 == 0:
-                                                <th style="text-align:left;" bgcolor="#DF013A" width="0.5%"></th>
-                                            %else:
-                                                <th style="text-align:left;" bgcolor="#0174DF" width="0.5%"></th>
-                                            %endif
-                                            <td class="celdaTotalTotales" width="19.5%">
-                                                ${_('Total')}
-                                            </td>
-                                            <td class="celdaTotalTotales" width="10%"></td>
-                                            <td class="celdaTotalTotales" width="6%">
-                                                ${formatLang(to_not_due, digits=2, grouping=True)}
-                                            </td>
-                                            <td class="celdaTotalTotales" width="6%"></td>
-                                            <td class="celdaTotalTotales" width="8%">
-                                                ${formatLang(residual, digits=2, grouping=True)}
-                                            </td>
-                                            <td class="celdaTotalTotales" width="10%">
-                                                ${formatLang(to0130, digits=2, grouping=True)}
-                                            </td>
-                                            <td class="celdaTotalTotales" width="10%">
-                                                ${formatLang(to3160, digits=2, grouping=True)}
-                                            </td>
-                                            <td class="celdaTotalTotales" width="10%">
-                                                ${formatLang(to6190, digits=2, grouping=True)}
-                                            </td>
-                                            <td class="celdaTotalTotales" width="10%">
-                                                ${formatLang(to91120, digits=2, grouping=True)}
-                                            </td>
-                                            <td class="celdaTotalTotales" width="10%">
-                                                ${formatLang(to121, digits=2, grouping=True)}
-                                            </td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                                <%
-                                tot_residual += residual
-                                tot_not_due += to_not_due
-                                tot_01to30 += to0130
-                                tot_31to60 += to3160
-                                tot_61to90 += to6190
-                                tot_91to120 += to91120
-                                tot_121togr += to121%>
-                            %endif
-                        %endfor
-                        <%ban += 1%>
-                    %endfor
-                    <table width="100%" border="0">
-                        <tr>
-                            <td class="celdaGrandTotal" width="20%">
-                                ${_('Grand Total')}
-                            </td>
-                            <td class="celdaGrandTotal" width="10%"></td>
-                            <td class="celdaGrandTotal" width="6%">
-                                ${formatLang(tot_not_due, digits=2, grouping=True)}
-                            </td>
-                            <td class="celdaGrandTotal" width="6%"></td>
-                            <td class="celdaGrandTotal" width="8%">
-                                ${formatLang(tot_residual, digits=2, grouping=True)}
-                            </td>
-                            <td class="celdaGrandTotal" width="10%">
-                                ${formatLang(tot_01to30, digits=2, grouping=True)}
-                            </td>
-                            <td class="celdaGrandTotal" width="10%">
-                                ${formatLang(tot_31to60, digits=2, grouping=True)}
-                            </td>
-                            <td class="celdaGrandTotal" width="10%">
-                                ${formatLang(tot_61to90, digits=2, grouping=True)}
-                            </td>
-                            <td class="celdaGrandTotal" width="10%">
-                                ${formatLang(tot_91to120, digits=2, grouping=True)}
-                            </td>
-                            <td class="celdaGrandTotal" width="10%">
-                                ${formatLang(tot_121togr, digits=2, grouping=True)}
-                            </td>
-                        </tr>
-                    </table>
-                %endif
-            %endif
-        %endfor
-    </body>
-</html>
+<<<<<<< TREE
+<html>
+    <head>
+        <style type="text/css">
+            ${css}
+        </style>
+    </head>
+    <body style="border:0; margin: 0;" onload="subst()" >
+        %for obj in objects :
+            <table>
+                <tr>
+                    <td width="10%">
+                        <div>${helper.embed_image('jpeg',str(obj.company_id.logo),220, 100)}</div>
+                    </td>
+                    <td>
+                        <table style="width: 100%; text-align:center;">
+                            <tr>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Chart of Accounts')}</th>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Fiscal Year')}</th>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Start Date')}</th>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Period Length(days)')}</th>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Partners ')}</th>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Analysis Direction')}</th>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Target Moves')}</th>
+                            </tr>
+                            <tr>
+                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${obj.chart_account_id.name or ''|entity}</th>
+                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${obj.fiscalyear_id.name or ''|entity}</th>
+                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${obj.date_from or ''|entity}</th>
+                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${obj.period_length or ''|entity}</th>
+                                
+                                %if obj.result_selection == 'customer':
+                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Receivable Accounts')}</th>
+                                    %elif obj.result_selection == 'supplier':
+                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Payable Accounts')}</th>
+                                    %elif obj.result_selection == 'customer_suppiler':
+                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Receivable and Payable Accounts')}</th>
+                                %endif
+                                %if obj.direction_selection == 'past':
+                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Past')}</th>
+                                    %elif obj.direction_selection == 'future':
+                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Future')}</th>
+                                %endif
+                                %if obj.target_move == 'posted':
+                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('All Posted Entries')}</th>
+                                    %elif obj.target_move == 'all':
+                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('All Entries')}</th>
+                                %endif
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+            <br clear="all"/>
+            
+            <table class="list_table"  width="100%" border="0">
+                <thead>
+                    <tr>
+                        <th class="celdaTituloTablaCompany" width="100%">${obj.company_id.name or ''|entity} (Expressed in ${obj.company_id.currency_id.name |entity} )</th>
+                    </tr>
+                </thead>
+            </table>
+            %if obj.type != "by_document":
+                <table class="list_table"  width="100%" border="0">
+                    <thead>
+                        <tr>
+                            <th class="celdaTituloTabla" style="text-align:center;" width="30%">${_('Partners')}</th>
+                            <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Not due')}</th>
+                            <% form = data['form']%>
+                            %for i in range (4,-1,-1):
+                                <th class="celdaTituloTabla" style="text-align:center;">${form.get('%i'%i).get('name')}</th>
+                            %endfor
+                            <th class="celdaTituloTabla" style="text-align:center;">${_('Total')}</th>
+                        </tr>
+                    </thead>
+                     
+                    <tbody>
+                        <%tot_not_due = tot_01to30 = tot_31to60 = tot_61to90 = tot_91to120 = tot_121togr = tot_total = 0%>
+                        %for line in obj.partner_line_ids:
+                            <tr class="prueba" >
+                                <td class="celdaLineDataTitulo" width="30%">
+                                    ${line.partner_id.name.upper()}
+                                </td>
+                                <td class="celdaLineData" width="10%">
+                                    ${line.not_due}
+                                </td>
+                                <td class="celdaLineData" width="10%">
+                                    ${line.days_due_01to30}
+                                </td>
+                                <td class="celdaLineData" width="10%">
+                                    ${line.days_due_31to60}
+                                </td>
+                                <td class="celdaLineData" width="10%">
+                                    ${line.days_due_61to90}
+                                </td>
+                                <td class="celdaLineData" width="10%">
+                                    ${line.days_due_91to120}
+                                </td>
+                                <td class="celdaLineData" width="10%">
+                                    ${line.days_due_121togr}
+                                </td>
+                                <td class="celdaTotal" width="10%">
+                                    ${line.total}
+                                </td>
+                            </tr>
+                            <%
+                            tot_not_due += line.not_due
+                            tot_01to30 += line.days_due_01to30
+                            tot_31to60 += line.days_due_31to60
+                            tot_61to90 += line.days_due_61to90
+                            tot_91to120 += line.days_due_91to120
+                            tot_121togr += line.days_due_121togr
+                            tot_total += line.total
+                            %>
+                        %endfor
+                        <tr class="prueba">
+                                <td class="celdaGrandTotal" width="30%">${_('Total')}</td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_not_due}
+                                </td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_01to30}
+                                </td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_31to60}
+                                </td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_61to90}
+                                </td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_91to120}
+                                </td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_121togr}
+                                </td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_total}
+                                </td>
+                            </tr>
+                    </tbody>
+                </table>
+            %endif
+            <%
+            group_user = True
+            show_aml = True
+            partner_ids = []
+            for wiz in obj.wizard_ids:
+                group_user = wiz.group_user
+                show_aml = wiz.show_aml
+                partner_ids = wiz.partner_ids and [x.id for x in wiz.partner_ids] or wiz.partner_ids_default and [x.id for x in wiz.partner_ids_default] or []
+                
+            def get_dict_lines_by_partner(lines):
+                dic_partner_lines = {}
+                for line in lines:
+                    if line.partner_id.id in partner_ids and line.partner_id.id:
+                        doc = line.document_id
+                        partner_name = line.partner_id.vat_split and line.partner_id.vat_split + ' - ' + line.partner_id.name or line.partner_id.name
+                        if show_aml or (not show_aml and doc._name != 'account.move.line'):
+                            if not group_user:
+                                if partner_name in dic_partner_lines:
+                                    dic_partner_lines.get(partner_name).append(line)
+                                else:   
+                                    dic_partner_lines.update({partner_name : [line]})
+                            else:
+                                user_id = doc._name == 'account.invoice' and doc.user_id and doc.user_id.name or doc.partner_id and doc.partner_id.user_id and doc.partner_id.user_id.name or "Not User"
+                                if user_id in dic_partner_lines:
+                                    dict_user = dic_partner_lines.get(user_id)
+                                    if partner_name in dict_user:
+                                        dic_partner_lines.get(user_id).get(partner_name).append(line)
+                                    else:   
+                                        dic_partner_lines.get(user_id).update({partner_name : [line]})
+                                else:   
+                                    dic_partner_lines.update({user_id : {partner_name : [line]}})
+                return dic_partner_lines
+            %>
+            %if obj.type == "by_document":
+                %if not group_user:
+                    <%tot_not_due = tot_01to30 = tot_31to60 = tot_61to90 = tot_91to120 = tot_121togr = tot_residual= 0%>
+                    %for partner in get_dict_lines_by_partner(obj.partner_doc_ids):
+                        <%
+                        lines_partner = get_dict_lines_by_partner(obj.partner_doc_ids).get(partner, False)
+                        %>
+                        %if lines_partner:
+                            <table class="list_table"  width="100%" border="0">
+                                <thead>
+                                    <tr>
+                                        <th class="celdaTituloPartner" style="text-align:left;" width="10%">${partner}</th>
+                                    </tr>
+                                </thead>
+                            </table>
+                            <table class="list_table"  width="100%" border="0">
+                                <thead>
+                                    <tr>
+                                        <th class="celdaTituloTabla" style="text-align:left;" width="20%">${_('Document')}</th>
+                                        <th class="celdaTituloTabla" style="text-align:left;" width="10%">${_('Type')}</th>
+                                        <th class="celdaTituloTabla" style="text-align:left;" width="6%">${_('Not Due')}</th>
+                                        <th class="celdaTituloTabla" style="text-align:left;" width="6%">${_('Due Days')}</th>
+                                        <th class="celdaTituloTabla" style="text-align:left;" width="8%">${_('Residual')}</th>
+                                        <% form = data['form']%>
+                                        %for i in range (4,-1,-1):
+                                            <th class="celdaTituloTabla" style="text-align:center;">${form.get('%i'%i).get('name')}</th>
+                                        %endfor
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <%to0130 = to3160 = to6190 = to91120 = to121 = residual = to_not_due = 0%>
+                                    %for line in lines_partner:
+                                        <%
+                                        type = ''
+                                        document = ''
+                                        if line.document_id._name == 'account.invoice':
+                                            document = line.document_id.number
+                                            type = 'Invoice'
+                                        elif line.document_id._name == 'account.voucher':
+                                            type = 'Voucher'
+                                            document = line.document_id.number
+                                        elif line.document_id._name == 'account.move.line':
+                                            type = 'Journal Entry Line'
+                                            document = line.document_id.name
+                                        to_not_due += line.not_due
+                                        to0130 += line.days_due_01to30
+                                        to3160 += line.days_due_31to60
+                                        to6190 += line.days_due_61to90
+                                        to91120 += line.days_due_91to120
+                                        to121 += line.days_due_121togr
+                                        residual += line.residual
+                                        %>
+                                        <tr class="prueba" >
+                                            <td class="celdaLineDataTitulo" width="20%">
+                                                ${document}
+                                            </td>
+                                            <td class="celdaLineData" width="10%">
+                                                ${type}
+                                            </td>
+                                            <td class="celdaLineData" style="text-align:center;" width="6%">
+                                                ${line.not_due}
+                                            </td>
+                                            <td class="celdaLineData" style="text-align:center;" width="6%">
+                                                ${line.due_days}
+                                            </td>
+                                            <td class="celdaLineData" width="8%">
+                                                ${line.residual}
+                                            </td>
+                                            <td class="celdaLineData" width="10%">
+                                                ${line.days_due_01to30}
+                                            </td>
+                                            <td class="celdaLineData" width="10%">
+                                                ${line.days_due_31to60}
+                                            </td>
+                                            <td class="celdaLineData" width="10%">
+                                                ${line.days_due_61to90}
+                                            </td>
+                                            <td class="celdaLineData" width="10%">
+                                                ${line.days_due_91to120}
+                                            </td>
+                                            <td class="celdaLineData" width="10%">
+                                                ${line.days_due_121togr}
+                                            </td>
+                                        </tr>
+                                    %endfor
+                                    <tr>
+                                        <td class="celdaTotalTotales" width="20%">
+                                            ${_('Total')}
+                                        </td>
+                                        <td class="celdaTotalTotales" width="10%"></td>
+                                        <td class="celdaTotalTotales" style="text-align:center;" width="6%">
+                                            ${formatLang(to_not_due, digits=2, grouping=True)}
+                                        </td>
+                                        <td class="celdaTotalTotales" style="text-align:center;" width="6%"></td>
+                                        <td class="celdaTotalTotales" width="8%">
+                                            ${formatLang(residual, digits=2, grouping=True)}
+                                        </td>
+                                        <td class="celdaTotalTotales" width="10%">
+                                            ${formatLang(to0130, digits=2, grouping=True)}
+                                        </td>
+                                        <td class="celdaTotalTotales" width="10%">
+                                            ${formatLang(to3160, digits=2, grouping=True)}
+                                        </td>
+                                        <td class="celdaTotalTotales" width="10%">
+                                            ${formatLang(to6190, digits=2, grouping=True)}
+                                        </td>
+                                        <td class="celdaTotalTotales" width="10%">
+                                            ${formatLang(to91120, digits=2, grouping=True)}
+                                        </td>
+                                        <td class="celdaTotalTotales" width="10%">
+                                            ${formatLang(to121, digits=2, grouping=True)}
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <%
+                            tot_residual += residual
+                            tot_not_due += to_not_due
+                            tot_01to30 += to0130
+                            tot_31to60 += to3160
+                            tot_61to90 += to6190
+                            tot_91to120 += to91120
+                            tot_121togr += to121%>
+                        %endif
+                    %endfor
+                    <table width="100%" border="0">
+                        <tr class="prueba" >
+                            <td class="celdaGrandTotal" width="20%">
+                                ${_('Grand Total')}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%"></td>
+                            <td class="celdaGrandTotal" style="text-align:center;" width="6%">
+                                ${formatLang(tot_not_due, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" style="text-align:center;" width="6%"></td>
+                            <td class="celdaGrandTotal" width="8%">
+                                ${formatLang(tot_residual, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_01to30, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_31to60, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_61to90, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_91to120, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_121togr, digits=2, grouping=True)}
+                            </td>
+                        </tr>
+                    </table>
+                %else:
+                    <%ban = 1%>
+                    <%tot_not_due = tot_01to30 = tot_31to60 = tot_61to90 = tot_91to120 = tot_121togr = tot_residual= 0%>
+                    %for user in get_dict_lines_by_partner(obj.partner_doc_ids):
+                        <table class="list_table"  width="100%" border="0">
+                            <thead>
+                                <tr>
+                                    %if ban % 2 == 0:
+                                        <th class="celdaTituloTablaUser" bgcolor="#DF013A" style="text-align:left;" width="10%">${user}</th>
+                                    %else:
+                                        <th class="celdaTituloTablaUser" bgcolor="#0174DF" style="text-align:left;" width="10%">${user}</th>
+                                    %endif
+                                </tr>
+                            </thead>
+                        </table>
+                        %for partner in get_dict_lines_by_partner(obj.partner_doc_ids).get(user, False):
+                            <%
+                            lines_partner = get_dict_lines_by_partner(obj.partner_doc_ids).get(user).get(partner, False)
+                            %>
+                            %if lines_partner:
+                                <table class="table_user"  width="100%" border="0">
+                                    <thead>
+                                        <tr>
+                                            %if ban % 2 == 0:
+                                                <th style="text-align:left;" bgcolor="#DF013A" width="0.5%"></th>
+                                            %else:
+                                                <th style="text-align:left;" bgcolor="#0174DF" width="0.5%"></th>
+                                            %endif
+                                            <th class="celdaTituloPartner" style="text-align:left;" width="0.5%">${partner}</th>
+                                        </tr>
+                                    </thead>
+                                </table>
+                                <table class="list_table"  width="100%" border="0">
+                                    <thead>
+                                        <tr>
+                                            %if ban % 2 == 0:
+                                                <th style="text-align:left;" bgcolor="#DF013A" width="0.5%"></th>
+                                            %else:
+                                                <th style="text-align:left;" bgcolor="#0174DF" width="0.5%"></th>
+                                            %endif
+                                            <th class="celdaTituloTabla" style="text-align:left;" width="19.5%">${_('Document')}</th>
+                                            <th class="celdaTituloTabla" style="text-align:left;" width="10%">${_('Type')}</th>
+                                            <th class="celdaTituloTabla" style="text-align:left;" width="6%">${_('Not Due')}</th>
+                                            <th class="celdaTituloTabla" style="text-align:left;" width="6%">${_('Due Days')}</th>
+                                            <th class="celdaTituloTabla" style="text-align:left;" width="8%">${_('Residual')}</th>
+                                            <% form = data['form']%>
+                                            %for i in range (4,-1,-1):
+                                                <th class="celdaTituloTabla" style="text-align:center;">${form.get('%i'%i).get('name')}</th>
+                                            %endfor
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <%
+                                        to0130 = to3160 = to6190 = to91120 = to121 = residual = to_not_due = 0%>
+                                        %for line in lines_partner:
+                                            <%
+                                            type = ''
+                                            document = ''
+                                            if line.document_id._name == 'account.invoice':
+                                                document = line.document_id.number
+                                                type = 'Invoice'
+                                            elif line.document_id._name == 'account.voucher':
+                                                type = 'Voucher'
+                                                document = line.document_id.number
+                                            elif line.document_id._name == 'account.move.line':
+                                                type = 'Journal Entry Line'
+                                                document = line.document_id.name
+                                            to0130 += line.days_due_01to30
+                                            to3160 += line.days_due_31to60
+                                            to6190 += line.days_due_61to90
+                                            to91120 += line.days_due_91to120
+                                            to121 += line.days_due_121togr
+                                            residual += line.residual
+                                            to_not_due += line.not_due
+                                            %>
+                                            <tr class="prueba" >
+                                                %if ban % 2 == 0:
+                                                    <th style="text-align:left;" bgcolor="#DF013A" width="0.5%"></th>
+                                                %else:
+                                                    <th style="text-align:left;" bgcolor="#0174DF" width="0.5%"></th>
+                                                %endif
+                                                <td class="celdaLineDataTitulo" width="19.5%">
+                                                    ${document}
+                                                </td>
+                                                <td class="celdaLineData" width="10%">
+                                                    ${type}
+                                                </td>
+                                                <td class="celdaLineData" style="text-align:center;" width="6%">
+                                                    ${line.not_due}
+                                                </td>
+                                                <td class="celdaLineData" style="text-align:center;" width="6%">
+                                                    ${line.due_days}
+                                                </td>
+                                                <td class="celdaLineData" width="8%">
+                                                    ${line.residual}
+                                                </td>
+                                                <td class="celdaLineData" width="10%">
+                                                    ${line.days_due_01to30}
+                                                </td>
+                                                <td class="celdaLineData" width="10%">
+                                                    ${line.days_due_31to60}
+                                                </td>
+                                                <td class="celdaLineData" width="10%">
+                                                    ${line.days_due_61to90}
+                                                </td>
+                                                <td class="celdaLineData" width="10%">
+                                                    ${line.days_due_91to120}
+                                                </td>
+                                                <td class="celdaLineData" width="10%">
+                                                    ${line.days_due_121togr}
+                                                </td>
+                                            </tr>
+                                        %endfor
+                                        <tr>
+                                            %if ban % 2 == 0:
+                                                <th style="text-align:left;" bgcolor="#DF013A" width="0.5%"></th>
+                                            %else:
+                                                <th style="text-align:left;" bgcolor="#0174DF" width="0.5%"></th>
+                                            %endif
+                                            <td class="celdaTotalTotales" width="19.5%">
+                                                ${_('Total')}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="10%"></td>
+                                            <td class="celdaTotalTotales" width="6%">
+                                                ${formatLang(to_not_due, digits=2, grouping=True)}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="6%"></td>
+                                            <td class="celdaTotalTotales" width="8%">
+                                                ${formatLang(residual, digits=2, grouping=True)}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="10%">
+                                                ${formatLang(to0130, digits=2, grouping=True)}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="10%">
+                                                ${formatLang(to3160, digits=2, grouping=True)}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="10%">
+                                                ${formatLang(to6190, digits=2, grouping=True)}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="10%">
+                                                ${formatLang(to91120, digits=2, grouping=True)}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="10%">
+                                                ${formatLang(to121, digits=2, grouping=True)}
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <%
+                                tot_residual += residual
+                                tot_not_due += to_not_due
+                                tot_01to30 += to0130
+                                tot_31to60 += to3160
+                                tot_61to90 += to6190
+                                tot_91to120 += to91120
+                                tot_121togr += to121%>
+                            %endif
+                        %endfor
+                        <%ban += 1%>
+                    %endfor
+                    <table width="100%" border="0">
+                        <tr>
+                            <td class="celdaGrandTotal" width="20%">
+                                ${_('Grand Total')}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%"></td>
+                            <td class="celdaGrandTotal" width="6%">
+                                ${formatLang(tot_not_due, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="6%"></td>
+                            <td class="celdaGrandTotal" width="8%">
+                                ${formatLang(tot_residual, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_01to30, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_31to60, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_61to90, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_91to120, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_121togr, digits=2, grouping=True)}
+                            </td>
+                        </tr>
+                    </table>
+                %endif
+            %endif
+        %endfor
+    </body>
+</html>
+=======
+<!DOCTYPE>
+<html>
+    <head>
+        <style type="text/css">
+            ${css}
+        </style>
+    </head>
+    <body style="border:0; margin: 0;" onload="subst()" >
+        %for obj in objects :
+            <table>
+                <tr>
+                    <td width="10%">
+                        <div>${helper.embed_image('jpeg',str(obj.company_id.logo),220, 100)}</div>
+                    </td>
+                    <td>
+                        <table style="width: 100%; text-align:center;">
+                            <tr>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Chart of Accounts')}</th>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Fiscal Year')}</th>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Start Date')}</th>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Period Length(days)')}</th>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Partners ')}</th>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Analysis Direction')}</th>
+                                <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Target Moves')}</th>
+                            </tr>
+                            <tr>
+                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${obj.chart_account_id.name or ''|entity}</th>
+                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${obj.fiscalyear_id.name or ''|entity}</th>
+                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${obj.date_from or ''|entity}</th>
+                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${obj.period_length or ''|entity}</th>
+                                
+                                %if obj.result_selection == 'customer':
+                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Receivable Accounts')}</th>
+                                    %elif obj.result_selection == 'supplier':
+                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Payable Accounts')}</th>
+                                    %elif obj.result_selection == 'customer_suppiler':
+                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Receivable and Payable Accounts')}</th>
+                                %endif
+                                %if obj.direction_selection == 'past':
+                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Past')}</th>
+                                    %elif obj.direction_selection == 'future':
+                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('Future')}</th>
+                                %endif
+                                %if obj.target_move == 'posted':
+                                <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('All Posted Entries')}</th>
+                                    %elif obj.target_move == 'all':
+                                    <th class="celdaBoxUp" style="text-align:center;" width="10%">${_('All Entries')}</th>
+                                %endif
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+            <br clear="all"/>
+            
+            <table class="list_table"  width="100%" border="0">
+                <thead>
+                    <tr>
+                        <th class="celdaTituloTablaCompany" width="100%">${obj.company_id.name or ''|entity} (Expressed in ${obj.company_id.currency_id.name |entity} )</th>
+                    </tr>
+                </thead>
+            </table>
+            %if obj.type != "by_document":
+                <table class="list_table"  width="100%" border="0">
+                    <thead>
+                        <tr>
+                            <th class="celdaTituloTabla" style="text-align:center;" width="30%">${_('Partners')}</th>
+                            <th class="celdaTituloTabla" style="text-align:center;" width="10%">${_('Not due')}</th>
+                            <% form = data['form']%>
+                            %for i in range (4,-1,-1):
+                                <th class="celdaTituloTabla" style="text-align:center;">${form.get('%i'%i).get('name')}</th>
+                            %endfor
+                            <th class="celdaTituloTabla" style="text-align:center;">${_('Total')}</th>
+                        </tr>
+                    </thead>
+                     
+                    <tbody>
+                        <%tot_not_due = tot_01to30 = tot_31to60 = tot_61to90 = tot_91to120 = tot_121togr = tot_total = 0%>
+                        %for line in obj.partner_line_ids:
+                            <tr class="prueba" >
+                                <td class="celdaLineDataTitulo" width="30%">
+                                    ${line.partner_id.name.upper()}
+                                </td>
+                                <td class="celdaLineData" width="10%">
+                                    ${line.not_due}
+                                </td>
+                                <td class="celdaLineData" width="10%">
+                                    ${line.days_due_01to30}
+                                </td>
+                                <td class="celdaLineData" width="10%">
+                                    ${line.days_due_31to60}
+                                </td>
+                                <td class="celdaLineData" width="10%">
+                                    ${line.days_due_61to90}
+                                </td>
+                                <td class="celdaLineData" width="10%">
+                                    ${line.days_due_91to120}
+                                </td>
+                                <td class="celdaLineData" width="10%">
+                                    ${line.days_due_121togr}
+                                </td>
+                                <td class="celdaTotal" width="10%">
+                                    ${line.total}
+                                </td>
+                            </tr>
+                            <%
+                            tot_not_due += line.not_due
+                            tot_01to30 += line.days_due_01to30
+                            tot_31to60 += line.days_due_31to60
+                            tot_61to90 += line.days_due_61to90
+                            tot_91to120 += line.days_due_91to120
+                            tot_121togr += line.days_due_121togr
+                            tot_total += line.total
+                            %>
+                        %endfor
+                        <tr class="prueba">
+                                <td class="celdaGrandTotal" width="30%">${_('Total')}</td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_not_due}
+                                </td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_01to30}
+                                </td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_31to60}
+                                </td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_61to90}
+                                </td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_91to120}
+                                </td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_121togr}
+                                </td>
+                                <td class="celdaGrandTotal" width="10%">
+                                    ${tot_total}
+                                </td>
+                            </tr>
+                    </tbody>
+                </table>
+            %endif
+            <%
+            group_user = True
+            show_aml = True
+            partner_ids = []
+            for wiz in obj.wizard_ids:
+                group_user = wiz.group_user
+                show_aml = wiz.show_aml
+                partner_ids = wiz.partner_ids and [x.id for x in wiz.partner_ids] or wiz.partner_ids_default and [x.id for x in wiz.partner_ids_default] or []
+                
+            def get_dict_lines_by_partner(lines):
+                dic_partner_lines = {}
+                for line in lines:
+                    if line.partner_id.id in partner_ids and line.partner_id.id:
+                        doc = line.document_id
+                        partner_name = line.partner_id.vat_split and line.partner_id.vat_split + ' - ' + line.partner_id.name or line.partner_id.name
+                        if show_aml or (not show_aml and doc._name != 'account.move.line'):
+                            if not group_user:
+                                if partner_name in dic_partner_lines:
+                                    dic_partner_lines.get(partner_name).append(line)
+                                else:   
+                                    dic_partner_lines.update({partner_name : [line]})
+                            else:
+                                user_id = doc._name == 'account.invoice' and doc.user_id and doc.user_id.name or doc.partner_id and doc.partner_id.user_id and doc.partner_id.user_id.name or "Not User"
+                                if user_id in dic_partner_lines:
+                                    dict_user = dic_partner_lines.get(user_id)
+                                    if partner_name in dict_user:
+                                        dic_partner_lines.get(user_id).get(partner_name).append(line)
+                                    else:   
+                                        dic_partner_lines.get(user_id).update({partner_name : [line]})
+                                else:   
+                                    dic_partner_lines.update({user_id : {partner_name : [line]}})
+                return dic_partner_lines
+            %>
+            %if obj.type == "by_document":
+                %if not group_user:
+                    <%tot_not_due = tot_01to30 = tot_31to60 = tot_61to90 = tot_91to120 = tot_121togr = tot_residual= 0%>
+                    %for partner in get_dict_lines_by_partner(obj.partner_doc_ids):
+                        <%
+                        lines_partner = get_dict_lines_by_partner(obj.partner_doc_ids).get(partner, False)
+                        %>
+                        %if lines_partner:
+                            <table class="list_table"  width="100%" border="0">
+                                <thead>
+                                    <tr>
+                                        <th class="celdaTituloPartner" style="text-align:left;" width="10%">${partner}</th>
+                                    </tr>
+                                </thead>
+                            </table>
+                            <table class="list_table"  width="100%" border="0">
+                                <thead>
+                                    <tr>
+                                        <th class="celdaTituloTabla" style="text-align:left;" width="20%">${_('Document')}</th>
+                                        <th class="celdaTituloTabla" style="text-align:left;" width="10%">${_('Type')}</th>
+                                        <th class="celdaTituloTabla" style="text-align:left;" width="6%">${_('Not Due')}</th>
+                                        <th class="celdaTituloTabla" style="text-align:left;" width="6%">${_('Due Days')}</th>
+                                        <th class="celdaTituloTabla" style="text-align:left;" width="8%">${_('Residual')}</th>
+                                        <% form = data['form']%>
+                                        %for i in range (4,-1,-1):
+                                            <th class="celdaTituloTabla" style="text-align:center;">${form.get('%i'%i).get('name')}</th>
+                                        %endfor
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <%to0130 = to3160 = to6190 = to91120 = to121 = residual = to_not_due = 0%>
+                                    %for line in lines_partner:
+                                        <%
+                                        type = ''
+                                        document = ''
+                                        if line.document_id._name == 'account.invoice':
+                                            document = line.document_id.number
+                                            type = 'Invoice'
+                                        elif line.document_id._name == 'account.voucher':
+                                            type = 'Voucher'
+                                            document = line.document_id.number
+                                        elif line.document_id._name == 'account.move.line':
+                                            type = 'Journal Entry Line'
+                                            document = line.document_id.name
+                                        to_not_due += line.not_due
+                                        to0130 += line.days_due_01to30
+                                        to3160 += line.days_due_31to60
+                                        to6190 += line.days_due_61to90
+                                        to91120 += line.days_due_91to120
+                                        to121 += line.days_due_121togr
+                                        residual += line.residual
+                                        %>
+                                        <tr class="prueba" >
+                                            <td class="celdaLineDataTitulo" width="20%">
+                                                ${document}
+                                            </td>
+                                            <td class="celdaLineData" width="10%">
+                                                ${type}
+                                            </td>
+                                            <td class="celdaLineData" style="text-align:center;" width="6%">
+                                                ${line.not_due}
+                                            </td>
+                                            <td class="celdaLineData" style="text-align:center;" width="6%">
+                                                ${line.due_days}
+                                            </td>
+                                            <td class="celdaLineData" width="8%">
+                                                ${line.residual}
+                                            </td>
+                                            <td class="celdaLineData" width="10%">
+                                                ${line.days_due_01to30}
+                                            </td>
+                                            <td class="celdaLineData" width="10%">
+                                                ${line.days_due_31to60}
+                                            </td>
+                                            <td class="celdaLineData" width="10%">
+                                                ${line.days_due_61to90}
+                                            </td>
+                                            <td class="celdaLineData" width="10%">
+                                                ${line.days_due_91to120}
+                                            </td>
+                                            <td class="celdaLineData" width="10%">
+                                                ${line.days_due_121togr}
+                                            </td>
+                                        </tr>
+                                    %endfor
+                                    <tr>
+                                        <td class="celdaTotalTotales" width="20%">
+                                            ${_('Total')}
+                                        </td>
+                                        <td class="celdaTotalTotales" width="10%"></td>
+                                        <td class="celdaTotalTotales" style="text-align:center;" width="6%">
+                                            ${formatLang(to_not_due, digits=2, grouping=True)}
+                                        </td>
+                                        <td class="celdaTotalTotales" style="text-align:center;" width="6%"></td>
+                                        <td class="celdaTotalTotales" width="8%">
+                                            ${formatLang(residual, digits=2, grouping=True)}
+                                        </td>
+                                        <td class="celdaTotalTotales" width="10%">
+                                            ${formatLang(to0130, digits=2, grouping=True)}
+                                        </td>
+                                        <td class="celdaTotalTotales" width="10%">
+                                            ${formatLang(to3160, digits=2, grouping=True)}
+                                        </td>
+                                        <td class="celdaTotalTotales" width="10%">
+                                            ${formatLang(to6190, digits=2, grouping=True)}
+                                        </td>
+                                        <td class="celdaTotalTotales" width="10%">
+                                            ${formatLang(to91120, digits=2, grouping=True)}
+                                        </td>
+                                        <td class="celdaTotalTotales" width="10%">
+                                            ${formatLang(to121, digits=2, grouping=True)}
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <%
+                            tot_residual += residual
+                            tot_not_due += to_not_due
+                            tot_01to30 += to0130
+                            tot_31to60 += to3160
+                            tot_61to90 += to6190
+                            tot_91to120 += to91120
+                            tot_121togr += to121%>
+                        %endif
+                    %endfor
+                    <table width="100%" border="0">
+                        <tr class="prueba" >
+                            <td class="celdaGrandTotal" width="20%">
+                                ${_('Grand Total')}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%"></td>
+                            <td class="celdaGrandTotal" style="text-align:center;" width="6%">
+                                ${formatLang(tot_not_due, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" style="text-align:center;" width="6%"></td>
+                            <td class="celdaGrandTotal" width="8%">
+                                ${formatLang(tot_residual, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_01to30, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_31to60, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_61to90, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_91to120, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_121togr, digits=2, grouping=True)}
+                            </td>
+                        </tr>
+                    </table>
+                %else:
+                    <%ban = 1%>
+                    <%tot_not_due = tot_01to30 = tot_31to60 = tot_61to90 = tot_91to120 = tot_121togr = tot_residual= 0%>
+                    %for user in get_dict_lines_by_partner(obj.partner_doc_ids):
+                        <table class="list_table"  width="100%" border="0">
+                            <thead>
+                                <tr>
+                                    %if ban % 2 == 0:
+                                        <th class="celdaTituloTablaUser" bgcolor="#DF013A" style="text-align:left;" width="10%">${user}</th>
+                                    %else:
+                                        <th class="celdaTituloTablaUser" bgcolor="#0174DF" style="text-align:left;" width="10%">${user}</th>
+                                    %endif
+                                </tr>
+                            </thead>
+                        </table>
+                        %for partner in get_dict_lines_by_partner(obj.partner_doc_ids).get(user, False):
+                            <%
+                            lines_partner = get_dict_lines_by_partner(obj.partner_doc_ids).get(user).get(partner, False)
+                            %>
+                            %if lines_partner:
+                                <table class="table_user"  width="100%" border="0">
+                                    <thead>
+                                        <tr>
+                                            %if ban % 2 == 0:
+                                                <th style="text-align:left;" bgcolor="#DF013A" width="0.5%"></th>
+                                            %else:
+                                                <th style="text-align:left;" bgcolor="#0174DF" width="0.5%"></th>
+                                            %endif
+                                            <th class="celdaTituloPartner" style="text-align:left;" width="0.5%">${partner}</th>
+                                        </tr>
+                                    </thead>
+                                </table>
+                                <table class="list_table"  width="100%" border="0">
+                                    <thead>
+                                        <tr>
+                                            %if ban % 2 == 0:
+                                                <th style="text-align:left;" bgcolor="#DF013A" width="0.5%"></th>
+                                            %else:
+                                                <th style="text-align:left;" bgcolor="#0174DF" width="0.5%"></th>
+                                            %endif
+                                            <th class="celdaTituloTabla" style="text-align:left;" width="19.5%">${_('Document')}</th>
+                                            <th class="celdaTituloTabla" style="text-align:left;" width="10%">${_('Type')}</th>
+                                            <th class="celdaTituloTabla" style="text-align:left;" width="6%">${_('Not Due')}</th>
+                                            <th class="celdaTituloTabla" style="text-align:left;" width="6%">${_('Due Days')}</th>
+                                            <th class="celdaTituloTabla" style="text-align:left;" width="8%">${_('Residual')}</th>
+                                            <% form = data['form']%>
+                                            %for i in range (4,-1,-1):
+                                                <th class="celdaTituloTabla" style="text-align:center;">${form.get('%i'%i).get('name')}</th>
+                                            %endfor
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <%
+                                        to0130 = to3160 = to6190 = to91120 = to121 = residual = to_not_due = 0%>
+                                        %for line in lines_partner:
+                                            <%
+                                            type = ''
+                                            document = ''
+                                            if line.document_id._name == 'account.invoice':
+                                                document = line.document_id.number
+                                                type = 'Invoice'
+                                            elif line.document_id._name == 'account.voucher':
+                                                type = 'Voucher'
+                                                document = line.document_id.number
+                                            elif line.document_id._name == 'account.move.line':
+                                                type = 'Journal Entry Line'
+                                                document = line.document_id.name
+                                            to0130 += line.days_due_01to30
+                                            to3160 += line.days_due_31to60
+                                            to6190 += line.days_due_61to90
+                                            to91120 += line.days_due_91to120
+                                            to121 += line.days_due_121togr
+                                            residual += line.residual
+                                            to_not_due += line.not_due
+                                            %>
+                                            <tr class="prueba" >
+                                                %if ban % 2 == 0:
+                                                    <th style="text-align:left;" bgcolor="#DF013A" width="0.5%"></th>
+                                                %else:
+                                                    <th style="text-align:left;" bgcolor="#0174DF" width="0.5%"></th>
+                                                %endif
+                                                <td class="celdaLineDataTitulo" width="19.5%">
+                                                    ${document}
+                                                </td>
+                                                <td class="celdaLineData" width="10%">
+                                                    ${type}
+                                                </td>
+                                                <td class="celdaLineData" style="text-align:center;" width="6%">
+                                                    ${line.not_due}
+                                                </td>
+                                                <td class="celdaLineData" style="text-align:center;" width="6%">
+                                                    ${line.due_days}
+                                                </td>
+                                                <td class="celdaLineData" width="8%">
+                                                    ${line.residual}
+                                                </td>
+                                                <td class="celdaLineData" width="10%">
+                                                    ${line.days_due_01to30}
+                                                </td>
+                                                <td class="celdaLineData" width="10%">
+                                                    ${line.days_due_31to60}
+                                                </td>
+                                                <td class="celdaLineData" width="10%">
+                                                    ${line.days_due_61to90}
+                                                </td>
+                                                <td class="celdaLineData" width="10%">
+                                                    ${line.days_due_91to120}
+                                                </td>
+                                                <td class="celdaLineData" width="10%">
+                                                    ${line.days_due_121togr}
+                                                </td>
+                                            </tr>
+                                        %endfor
+                                        <tr>
+                                            %if ban % 2 == 0:
+                                                <th style="text-align:left;" bgcolor="#DF013A" width="0.5%"></th>
+                                            %else:
+                                                <th style="text-align:left;" bgcolor="#0174DF" width="0.5%"></th>
+                                            %endif
+                                            <td class="celdaTotalTotales" width="19.5%">
+                                                ${_('Total')}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="10%"></td>
+                                            <td class="celdaTotalTotales" width="6%">
+                                                ${formatLang(to_not_due, digits=2, grouping=True)}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="6%"></td>
+                                            <td class="celdaTotalTotales" width="8%">
+                                                ${formatLang(residual, digits=2, grouping=True)}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="10%">
+                                                ${formatLang(to0130, digits=2, grouping=True)}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="10%">
+                                                ${formatLang(to3160, digits=2, grouping=True)}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="10%">
+                                                ${formatLang(to6190, digits=2, grouping=True)}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="10%">
+                                                ${formatLang(to91120, digits=2, grouping=True)}
+                                            </td>
+                                            <td class="celdaTotalTotales" width="10%">
+                                                ${formatLang(to121, digits=2, grouping=True)}
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <%
+                                tot_residual += residual
+                                tot_not_due += to_not_due
+                                tot_01to30 += to0130
+                                tot_31to60 += to3160
+                                tot_61to90 += to6190
+                                tot_91to120 += to91120
+                                tot_121togr += to121%>
+                            %endif
+                        %endfor
+                        <%ban += 1%>
+                    %endfor
+                    <table width="100%" border="0">
+                        <tr>
+                            <td class="celdaGrandTotal" width="20%">
+                                ${_('Grand Total')}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%"></td>
+                            <td class="celdaGrandTotal" width="6%">
+                                ${formatLang(tot_not_due, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="6%"></td>
+                            <td class="celdaGrandTotal" width="8%">
+                                ${formatLang(tot_residual, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_01to30, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_31to60, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_61to90, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_91to120, digits=2, grouping=True)}
+                            </td>
+                            <td class="celdaGrandTotal" width="10%">
+                                ${formatLang(tot_121togr, digits=2, grouping=True)}
+                            </td>
+                        </tr>
+                    </table>
+                %endif
+            %endif
+        %endfor
+    </body>
+</html>
+>>>>>>> MERGE-SOURCE

=== added directory 'account_amortization'
=== added file 'account_amortization/__init__.py'
--- account_amortization/__init__.py	1970-01-01 00:00:00 +0000
+++ account_amortization/__init__.py	2014-05-13 00:34:34 +0000
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Sabrina Romero ([e-mail])
+############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import model

=== added file 'account_amortization/__openerp__.py'
--- account_amortization/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_amortization/__openerp__.py	2014-05-13 00:34:34 +0000
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Sabrina Romero ([e-mail])
+############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name": "Vauxoo Account Amortization",
+    "version": "0.1",
+    "depends": [
+                "account_asset",
+                "account_asset_date",
+               ],
+    "author": "Vauxoo",
+    "licence": "AGPL v3",
+    "website": "http://www.vauxoo.com",
+    "category": "Accounting & Finance",
+    "description": """
+Vauxoo Account Amortization.
+============================
+This module allows to separate the expenses amortization of the assets 
+depreciation.
+
+This module adds:
+-----------------
+- Accounting > Amortization
+- Accounting > Amortization > Amortization
+- Configuration > Amortization
+- Configuration > Amortization > Amortization Categories
+
+See the documentation here:
+---------------------------
+http://www.principlesofaccounting.com/chapter13/chapter13.html
+""",
+    "data":[
+        "view/account_amortization_view.xml",
+        ],
+    "installable": True,
+    "auto_install": False,
+}

=== added directory 'account_amortization/data'
=== added directory 'account_amortization/demo'
=== added directory 'account_amortization/doc'
=== added directory 'account_amortization/i18n'
=== added file 'account_amortization/i18n/account_amortization.pot'
--- account_amortization/i18n/account_amortization.pot	1970-01-01 00:00:00 +0000
+++ account_amortization/i18n/account_amortization.pot	2014-05-13 00:34:34 +0000
@@ -0,0 +1,77 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_amortization
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-07 14:38+0000\n"
+"PO-Revision-Date: 2014-01-07 14:38+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_amortization
+#: model:ir.actions.act_window,name:account_amortization.action_account_amortization_category_form
+#: model:ir.ui.menu,name:account_amortization.menu_action_account_amortization_category_form
+msgid "Amortization Expenses Categories"
+msgstr ""
+
+#. module: account_amortization
+#: selection:account.asset.asset,doc_type:0
+#: selection:account.asset.category,doc_type:0
+msgid "Deprecation"
+msgstr ""
+
+#. module: account_amortization
+#: help:account.asset.category,doc_type:0
+msgid "Asset category type, deprecation allows you depreciate an asset, the \n"
+"                amortization allows you amortize an expense."
+msgstr ""
+
+#. module: account_amortization
+#: help:account.asset.asset,doc_type:0
+msgid "Asset type, deprecation allows you depreciate an asset, the \n"
+"                amortization allows you amortize an expense."
+msgstr ""
+
+#. module: account_amortization
+#: model:ir.model,name:account_amortization.model_account_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account_amortization
+#: model:ir.model,name:account_amortization.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_amortization
+#: model:ir.actions.act_window,name:account_amortization.action_account_amortization_amortization_form
+#: model:ir.ui.menu,name:account_amortization.menu_action_account_amortization_amortization_form
+#: model:ir.ui.menu,name:account_amortization.menu_finance_amortization
+#: model:ir.ui.menu,name:account_amortization.menu_finance_config_amortization
+msgid "Amortization Expenses"
+msgstr ""
+
+#. module: account_amortization
+#: selection:account.asset.asset,doc_type:0
+#: selection:account.asset.category,doc_type:0
+msgid "Amortization"
+msgstr ""
+
+#. module: account_amortization
+#: model:ir.actions.act_window,name:account_amortization.action_account_amortization_amortization_hierarchy_tree
+#: model:ir.ui.menu,name:account_amortization.menu_action_account_amortization_amortization_hierarchy_tree
+msgid "Amortization Expenses Hierarchy"
+msgstr ""
+
+#. module: account_amortization
+#: field:account.asset.asset,doc_type:0
+#: field:account.asset.category,doc_type:0
+msgid "Type"
+msgstr ""
+

=== added directory 'account_amortization/model'
=== added file 'account_amortization/model/__init__.py'
--- account_amortization/model/__init__.py	1970-01-01 00:00:00 +0000
+++ account_amortization/model/__init__.py	2014-05-13 00:34:34 +0000
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Sabrina Romero ([e-mail])
+############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_amortization

=== added file 'account_amortization/model/account_amortization.py'
--- account_amortization/model/account_amortization.py	1970-01-01 00:00:00 +0000
+++ account_amortization/model/account_amortization.py	2014-05-13 00:34:34 +0000
@@ -0,0 +1,53 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Sabrina Romero ([e-mail])
+############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
+
+class account_asset_asset(osv.Model):
+    
+    _inherit = 'account.asset.asset'
+    _description = 'Account Amortization'
+
+    _columns = {
+        'doc_type':fields.selection([('deprecation','Deprecation'),
+            ('amortization','Amortization'),], 'Type',              
+            help='''Asset type, deprecation allows you depreciate an asset, the 
+                amortization allows you amortize an expense.'''),
+        }
+
+class account_asset_category(osv.Model):
+
+    _inherit = 'account.asset.category'
+    _description = 'Account Amortization Category'
+
+    _columns = {
+        'doc_type': fields.selection([('deprecation','Deprecation'),
+            ('amortization','Amortization'),], 'Type',
+            help='''Asset category type, deprecation allows you depreciate an asset, the 
+                amortization allows you amortize an expense.'''),
+        }

=== added directory 'account_amortization/security'
=== added directory 'account_amortization/static'
=== added directory 'account_amortization/static/src'
=== added directory 'account_amortization/static/src/css'
=== added directory 'account_amortization/static/src/img'
=== added file 'account_amortization/static/src/img/icon.png'
Binary files account_amortization/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and account_amortization/static/src/img/icon.png	2014-05-13 00:34:34 +0000 differ
=== added directory 'account_amortization/static/src/js'
=== added directory 'account_amortization/static/src/xml'
=== added directory 'account_amortization/view'
=== added file 'account_amortization/view/account_amortization_view.xml'
--- account_amortization/view/account_amortization_view.xml	1970-01-01 00:00:00 +0000
+++ account_amortization/view/account_amortization_view.xml	2014-05-13 00:34:34 +0000
@@ -0,0 +1,189 @@
+<openerp>
+<data>
+    
+    <!--
+        Amortization category action
+    -->
+
+    <record model="ir.actions.act_window" id="action_account_amortization_category_form">
+        <field name="name">Amortization Expenses Categories</field>
+        <field name="res_model">account.asset.category</field>
+        <field name="domain">[('doc_type','=','amortization')]</field>           
+        <field name="context">{'default_doc_type': 'amortization'}</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>                       
+        <field name="search_view_id" ref="account_asset.view_account_asset_category_search"/>
+        <field name="Help"></field>
+    </record>
+    <record model="ir.actions.act_window.view" id="view_amortization_category_tree">    
+        <field name="act_window_id" ref='action_account_amortization_category_form'/>
+        <field name="sequence">10</field>                               
+        <field name="view_mode">tree</field>                            
+        <field name="view_id" ref="account_asset.view_account_asset_category_tree"/>      
+    </record>                                                           
+    <record model="ir.actions.act_window.view" id="view_amortization_category_form">    
+        <field name="act_window_id" ref='action_account_amortization_category_form'/>             
+        <field name="sequence">20</field>                               
+        <field name="view_mode">form</field>                            
+        <field name="view_id" ref='account_asset.view_account_asset_category_form'/>                     
+    </record>
+    
+    <!--
+        Account asset category action is overwritten adding doc_type domain
+    -->
+
+    <record model="ir.actions.act_window" id="account_asset.action_account_asset_asset_list_normal">
+        <field name="name">Asset Categories</field>
+        <field name="res_model">account.asset.category</field>
+        <field name="domain">[('doc_type','=','deprecation')]</field>              
+        <field name="context">{'default_doc_type': 'deprecation'}</field> 
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="account_asset.view_account_asset_category_search"/>
+        <field name="Help"></field>
+    </record>
+    <record model="ir.actions.act_window.view" id="view_category_tree">     
+        <field name="act_window_id" ref="account_asset.action_account_asset_asset_list_normal"/>
+        <field name="sequence">10</field>                                       
+        <field name="view_mode">tree</field>                                    
+        <field name="view_id" ref="account_asset.view_account_asset_category_tree"/>      
+    </record>                                                                   
+    <record model="ir.actions.act_window.view" id="view_category_form">     
+        <field name="act_window_id" ref="account_asset.action_account_asset_asset_list_normal"/>             
+        <field name="sequence">20</field>                                       
+        <field name="view_mode">form</field>                                    
+        <field name="view_id" ref="account_asset.view_account_asset_category_form"/>                     
+    </record>
+    
+    <!--
+        Amortization category menu item
+    -->
+    
+    <menuitem id="menu_finance_config_amortization" name="Amortization Expenses" parent="account.menu_finance_configuration" sequence="25"/>
+	<menuitem parent="menu_finance_config_amortization" id="menu_action_account_amortization_category_form" action="action_account_amortization_category_form"/>
+    
+    <!--
+        Amortization action
+    -->
+    
+    <record model="ir.actions.act_window" id="action_account_amortization_amortization_form">
+        <field name="name">Amortization Expenses</field>
+        <field name="res_model">account.asset.asset</field>
+        <field name="domain">[('doc_type','=','amortization')]</field>           
+        <field name="context">{'default_doc_type': 'amortization'}</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>                       
+        <field name="search_view_id" ref="account_asset.view_account_asset_search"/>
+        <field name="Help">Amortization records according to selected parameters to generate the accounting poliza for allocating amortization expense.</field>
+    </record>
+    <record model="ir.actions.act_window.view" id="view_amortization_tree">    
+        <field name="act_window_id" ref='action_account_amortization_amortization_form'/>
+        <field name="sequence">10</field>                               
+        <field name="view_mode">tree</field>                            
+        <field name="view_id" ref="account_asset.view_account_asset_asset_tree"/>      
+    </record>                                                           
+    <record model="ir.actions.act_window.view" id="view_amortization_form">    
+        <field name="act_window_id" ref='action_account_amortization_amortization_form'/>             
+        <field name="sequence">20</field>                               
+        <field name="view_mode">form</field>                            
+        <field name="view_id" ref='account_asset.view_account_asset_asset_form'/>                     
+    </record>    
+
+    <!--
+        Account asset action is overwritten adding doc_type domain
+    -->
+
+    <record model="ir.actions.act_window" id="account_asset.action_account_asset_asset_form">
+        <field name="name">Assets</field>
+        <field name="res_model">account.asset.asset</field>
+        <field name="domain">[('doc_type','=','deprecation')]</field>              
+        <field name="context">{'default_doc_type': 'deprecation'}</field> 
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="account_asset.view_account_asset_search"/>
+        <field name="Help">Assets records according to selected parameters to generate the accounting poliza for allocating deprecation expense.</field>
+    </record>
+    <record model="ir.actions.act_window.view" id="view_another_tree">     
+        <field name="act_window_id" ref='account_asset.action_account_asset_asset_form'/>
+        <field name="sequence">10</field>                                       
+        <field name="view_mode">tree</field>                                    
+        <field name="view_id" ref="account_asset.view_account_asset_asset_tree"/>      
+    </record>                                                                   
+    <record model="ir.actions.act_window.view" id="view_another_form">     
+        <field name="act_window_id" ref='account_asset.action_account_asset_asset_form'/>             
+        <field name="sequence">20</field>                                       
+        <field name="view_mode">form</field>                                    
+        <field name="view_id" ref='account_asset.view_account_asset_asset_form'/>                     
+     </record>
+     
+    <!--
+        Amortization menu item
+    -->
+    
+	<menuitem id="menu_finance_amortization" name="Amortization Expenses" parent="account.menu_finance" sequence="9"/>
+    <menuitem parent="menu_finance_amortization" id="menu_action_account_amortization_amortization_form" action="action_account_amortization_amortization_form"/>
+
+    <!--
+        Amortization hierarchy view action
+    -->
+
+    <record model="ir.actions.act_window" id="action_account_amortization_amortization_hierarchy_tree"> 
+        <field name="name">Amortization Expenses Hierarchy</field>                              
+        <field name="res_model">account.asset.asset</field>                     
+        <field name="domain">[('doc_type','=','amortization'),('parent_id','=',False)]</field>
+        <field name="context">{'default_doc_type': 'amortization'}</field>
+        <field name="view_type">tree</field>                                    
+        <field name="view_mode">tree</field>
+        <field name="Help">Amortization records in hierarchy view, allows grouping regarding parent record.</field>
+    </record> 
+    <record model="ir.actions.act_window.view" id="view_another_hierarchy">          
+        <field name="act_window_id" ref='action_account_amortization_amortization_hierarchy_tree'/>     
+        <field name="sequence">10</field>                                       
+        <field name="view_mode">tree</field>                         
+        <field name="view_id" ref="account_asset.view_account_asset_asset_hierarchy_tree"/>
+    </record>  
+  
+    <!--
+        Account asset hierarchy action is overwritten adding doc_type domain
+	-->  
+	
+	<record model="ir.actions.act_window" id="account_asset.action_account_asset_asset_tree"> 
+        <field name="name">Asset Hierarchy</field>                              
+        <field name="res_model">account.asset.asset</field>                     
+        <field name="domain">[('doc_type','=','deprecation'),('parent_id','=',False)]</field>
+        <field name="context">{'default_doc_type': 'deprecation'}</field>
+        <field name="view_type">tree</field>                                    
+        <field name="view_mode">tree</field>
+        <field name="Help"></field>
+    </record> 
+    <record model="ir.actions.act_window.view" id="account_asset.view_another_asset_hierarchy">          
+        <field name="act_window_id" ref='account_asset.action_account_asset_asset_tree'/>     
+        <field name="sequence">10</field>                                       
+        <field name="view_mode">tree</field>                         
+        <field name="view_id" ref="account_asset.view_account_asset_asset_hierarchy_tree"/>
+    </record> 
+
+    <!--
+        Amortization hierarchy view menu item
+    -->
+
+    <menuitem parent="menu_finance_amortization" id="menu_action_account_amortization_amortization_hierarchy_tree"
+        sequence="100" action="action_account_amortization_amortization_hierarchy_tree"/>
+
+    <!--
+         Field category_id in account_asset view is overwritten adding doc_type domain
+    -->
+    
+    <record model="ir.ui.view" id="view_account_asset_analytic_form">
+        <field name="name">account.asset.asset.form</field>
+        <field name="model">account.asset.asset</field>
+        <field name="inherit_id" ref="account_asset.view_account_asset_asset_form"/>
+        <field name="arch" type="xml">
+            <xpath expr='//field[@name="category_id"]' position='replace'>
+                <field name="category_id" on_change="onchange_category_id(category_id)" domain="[('doc_type','=',context.get('default_doc_type'))]"/>
+            </xpath>
+        </field>
+    </record>
+
+</data>
+</openerp>

=== modified file 'account_analytic_active_field/i18n/es.po'
--- account_analytic_active_field/i18n/es.po	2014-01-29 06:05:24 +0000
+++ account_analytic_active_field/i18n/es.po	2014-05-13 00:34:34 +0000
@@ -6,15 +6,27 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2013-11-07 01:14+0000\n"
 "PO-Revision-Date: 2013-11-07 04:21+0000\n"
 "Last-Translator: Isaac López Zúñiga - http://www.vauxoo.com <Unknown>\n"
+=======
+"POT-Creation-Date: 2013-11-07 01:14+0000\n"
+"PO-Revision-Date: 2013-11-07 04:21+0000\n"
+"Last-Translator: Isaac López Zúñiga <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
+<<<<<<< TREE
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
+=======
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_analytic_active_field
 #: field:account.analytic.account,active:0

=== modified file 'account_analytic_active_field/i18n/pt_BR.po'
--- account_analytic_active_field/i18n/pt_BR.po	2014-01-29 06:05:24 +0000
+++ account_analytic_active_field/i18n/pt_BR.po	2014-05-13 00:34:34 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Brazilian Portuguese translation for addons-vauxoo
 # Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the addons-vauxoo package.
@@ -26,3 +27,33 @@
 #: model:ir.model,name:account_analytic_active_field.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
+=======
+# Brazilian Portuguese translation for addons-vauxoo
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the addons-vauxoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: addons-vauxoo\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-11-07 01:14+0000\n"
+"PO-Revision-Date: 2014-01-10 11:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_analytic_active_field
+#: field:account.analytic.account,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_analytic_active_field
+#: model:ir.model,name:account_analytic_active_field.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== modified file 'account_analytic_btree/i18n/es.po'
--- account_analytic_btree/i18n/es.po	2014-01-29 06:05:24 +0000
+++ account_analytic_btree/i18n/es.po	2014-05-13 00:34:34 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Spanish translation for addons-vauxoo
 # Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
 # This file is distributed under the same license as the addons-vauxoo package.
@@ -32,3 +33,39 @@
 #: field:account.analytic.account,parent_right:0
 msgid "Parent Right"
 msgstr "Padre derecho"
+=======
+# Spanish translation for addons-vauxoo
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the addons-vauxoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: addons-vauxoo\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-11-07 01:14+0000\n"
+"PO-Revision-Date: 2013-11-07 07:45+0000\n"
+"Last-Translator: hbto [Vauxoo] http://www.vauxoo.com "
+"<[e-mail]>\n"
+"Language-Team: Spanish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_analytic_btree
+#: model:ir.model,name:account_analytic_btree.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: account_analytic_btree
+#: field:account.analytic.account,parent_left:0
+msgid "Parent Left"
+msgstr "Padre izquierdo"
+
+#. module: account_analytic_btree
+#: field:account.analytic.account,parent_right:0
+msgid "Parent Right"
+msgstr "Padre derecho"
+>>>>>>> MERGE-SOURCE

=== modified file 'account_analytic_btree/i18n/pt_BR.po'
--- account_analytic_btree/i18n/pt_BR.po	2014-01-29 06:05:24 +0000
+++ account_analytic_btree/i18n/pt_BR.po	2014-05-13 00:34:34 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Brazilian Portuguese translation for addons-vauxoo
 # Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the addons-vauxoo package.
@@ -31,3 +32,38 @@
 #: field:account.analytic.account,parent_right:0
 msgid "Parent Right"
 msgstr ""
+=======
+# Brazilian Portuguese translation for addons-vauxoo
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the addons-vauxoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: addons-vauxoo\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-11-07 01:14+0000\n"
+"PO-Revision-Date: 2014-01-10 11:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_analytic_btree
+#: model:ir.model,name:account_analytic_btree.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_btree
+#: field:account.analytic.account,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: account_analytic_btree
+#: field:account.analytic.account,parent_right:0
+msgid "Parent Right"
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== modified file 'account_analytic_required/i18n/es.po'
--- account_analytic_required/i18n/es.po	2014-01-29 06:05:24 +0000
+++ account_analytic_required/i18n/es.po	2014-05-13 00:34:34 +0000
@@ -13,9 +13,15 @@
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
+<<<<<<< TREE
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
+=======
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_analytic_required
 #: model:ir.model,name:account_analytic_required.model_account_account

=== modified file 'account_analytic_required/i18n/pt_BR.po'
--- account_analytic_required/i18n/pt_BR.po	2014-01-29 06:05:24 +0000
+++ account_analytic_required/i18n/pt_BR.po	2014-05-13 00:34:34 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Brazilian Portuguese translation for addons-vauxoo
 # Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the addons-vauxoo package.
@@ -74,3 +75,81 @@
 msgid ""
 "If this field is active, be required fill the field \"account analytic\""
 msgstr ""
+=======
+# Brazilian Portuguese translation for addons-vauxoo
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the addons-vauxoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: addons-vauxoo\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-11-07 01:14+0000\n"
+"PO-Revision-Date: 2014-01-11 14:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_analytic_required
+#: model:ir.model,name:account_analytic_required.model_account_account
+msgid "Account"
+msgstr ""
+
+#. module: account_analytic_required
+#: view:account.invoice:0
+msgid ""
+"onchange_account_id(product_id, parent.partner_id, parent.type, "
+"parent.fiscal_position, account_id)"
+msgstr ""
+
+#. module: account_analytic_required
+#: model:ir.model,name:account_analytic_required.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_analytic_required
+#: field:account.account,analytic_required:0
+#: field:account.invoice.line,analytic_required:0
+msgid "Analytic Required"
+msgstr ""
+
+#. module: account_analytic_required
+#: view:account.invoice:0
+msgid "{'required': [('analytic_required', '=', True)]}"
+msgstr ""
+
+#. module: account_analytic_required
+#: model:ir.model,name:account_analytic_required.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_required
+#: help:account.account,analytic_required:0
+msgid ""
+"If this field is active, the journal items that used this account should "
+"have an analytic account"
+msgstr ""
+
+#. module: account_analytic_required
+#: code:addons/account_analytic_required/account.py:74
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: account_analytic_required
+#: code:addons/account_analytic_required/account.py:74
+#, python-format
+msgid "Need add analytic account in move with name ."
+msgstr ""
+
+#. module: account_analytic_required
+#: help:account.invoice.line,analytic_required:0
+msgid ""
+"If this field is active, be required fill the field \"account analytic\""
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== modified file 'account_asset_analytic/i18n/es.po'
--- account_asset_analytic/i18n/es.po	2014-01-29 06:05:24 +0000
+++ account_asset_analytic/i18n/es.po	2014-05-13 00:34:34 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_asset_analytic
 #: field:account.asset.asset,account_analytic_id:0

=== modified file 'account_asset_analytic/i18n/pt_BR.po'
--- account_asset_analytic/i18n/pt_BR.po	2014-01-29 06:05:24 +0000
+++ account_asset_analytic/i18n/pt_BR.po	2014-05-13 00:34:34 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Brazilian Portuguese translation for addons-vauxoo
 # Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the addons-vauxoo package.
@@ -31,3 +32,38 @@
 #: model:ir.model,name:account_asset_analytic.model_account_asset_asset
 msgid "Asset"
 msgstr ""
+=======
+# Brazilian Portuguese translation for addons-vauxoo
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the addons-vauxoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: addons-vauxoo\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-11-07 01:14+0000\n"
+"PO-Revision-Date: 2014-01-10 11:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_asset_analytic
+#: field:account.asset.asset,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset_analytic
+#: model:ir.model,name:account_asset_analytic.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset_analytic
+#: model:ir.model,name:account_asset_analytic.model_account_asset_asset
+msgid "Asset"
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== modified file 'account_asset_date/i18n/es.po'
--- account_asset_date/i18n/es.po	2014-01-29 06:05:24 +0000
+++ account_asset_date/i18n/es.po	2014-05-13 00:34:34 +0000
@@ -6,15 +6,26 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2013-11-07 01:13+0000\n"
 "PO-Revision-Date: 2013-11-07 04:16+0000\n"
 "Last-Translator: Isaac López Zúñiga - http://www.vauxoo.com <Unknown>\n"
+=======
+"POT-Creation-Date: 2013-11-07 01:13+0000\n"
+"PO-Revision-Date: 2013-11-07 04:16+0000\n"
+"Last-Translator: Isaac López Zúñiga <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_asset_date
 #: field:account.asset.asset,date_acquisition:0

=== modified file 'account_asset_date/i18n/es_MX.po'
--- account_asset_date/i18n/es_MX.po	2014-01-29 06:05:24 +0000
+++ account_asset_date/i18n/es_MX.po	2014-05-13 00:34:34 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_asset_date
 #: field:account.asset.asset,date_acquisition:0

=== modified file 'account_asset_date/i18n/pt_BR.po'
--- account_asset_date/i18n/pt_BR.po	2014-01-29 06:05:24 +0000
+++ account_asset_date/i18n/pt_BR.po	2014-05-13 00:34:34 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Brazilian Portuguese translation for addons-vauxoo
 # Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the addons-vauxoo package.
@@ -39,3 +40,46 @@
 #, python-format
 msgid "Date acquisition"
 msgstr ""
+=======
+# Brazilian Portuguese translation for addons-vauxoo
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the addons-vauxoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: addons-vauxoo\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-11-07 01:13+0000\n"
+"PO-Revision-Date: 2014-01-10 12:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_asset_date
+#: field:account.asset.asset,date_acquisition:0
+msgid "Date Acquisition"
+msgstr ""
+
+#. module: account_asset_date
+#: code:addons/account_asset_date/account_asset.py:39
+#, python-format
+msgid "Depreciation start date"
+msgstr ""
+
+#. module: account_asset_date
+#: model:ir.model,name:account_asset_date.model_account_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account_asset_date
+#: help:account.asset.asset,date_acquisition:0
+#: code:addons/account_asset_date/account_asset.py:40
+#, python-format
+msgid "Date acquisition"
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== added directory 'account_asset_move_check'
=== added file 'account_asset_move_check/__init__.py'
--- account_asset_move_check/__init__.py	1970-01-01 00:00:00 +0000
+++ account_asset_move_check/__init__.py	2014-05-13 00:34:34 +0000
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Sabrina Romero ([e-mail])
+############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import model 

=== added file 'account_asset_move_check/__openerp__.py'
--- account_asset_move_check/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_asset_move_check/__openerp__.py	2014-05-13 00:34:34 +0000
@@ -0,0 +1,62 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Sabrina Romero ([e-mail])
+############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name' : 'Account Asset Move Check',
+    'version' : '0.1',                                                             
+    'author': 'Vauxoo',
+    'website': 'http://www.vauxoo.com',
+    'category' : 'Accounting',
+    'description' : """
+Account Asset Move Check
+========================
+
+This module add a field that makes posible check like posted some
+deprecations lines with an special condition using the "check_posted"
+field in the validation of "_get_move_check" function.
+
+    """,
+    'images' : [],                                                                 
+    'depends' : [
+        'account',
+        'account_asset',
+    ],                                                                
+    'data': [                                                                      
+    ],                                                                                 
+    'js': [                                                                        
+    ],                                                                                 
+    'qweb' : [                                                                     
+    ],                                                                                 
+    'css':[                                                                        
+    ],                                                                                 
+    'demo': [                                                                      
+    ],                                                                                 
+    'test': [                                                                      
+    ], 
+    'installable': True,                                                           
+    'auto_install': False,                                                         
+}                                                                                  
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'account_asset_move_check/data'
=== added directory 'account_asset_move_check/demo'
=== added directory 'account_asset_move_check/doc'
=== added directory 'account_asset_move_check/i18n'
=== added file 'account_asset_move_check/i18n/account_asset_move_check.pot'
--- account_asset_move_check/i18n/account_asset_move_check.pot	1970-01-01 00:00:00 +0000
+++ account_asset_move_check/i18n/account_asset_move_check.pot	2014-05-13 00:34:34 +0000
@@ -0,0 +1,27 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_asset_move_check
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-26 00:29+0000\n"
+"PO-Revision-Date: 2013-11-26 00:29+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_asset_move_check
+#: model:ir.model,name:account_asset_move_check.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset_move_check
+#: field:account.asset.depreciation.line,check_posted:0
+msgid "Posted"
+msgstr ""
+

=== added directory 'account_asset_move_check/model'
=== added file 'account_asset_move_check/model/__init__.py'
--- account_asset_move_check/model/__init__.py	1970-01-01 00:00:00 +0000
+++ account_asset_move_check/model/__init__.py	2014-05-13 00:34:34 +0000
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Sabrina Romero ([e-mail])
+############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_asset 

=== added file 'account_asset_move_check/model/account_asset.py'
--- account_asset_move_check/model/account_asset.py	1970-01-01 00:00:00 +0000
+++ account_asset_move_check/model/account_asset.py	2014-05-13 00:34:34 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2013 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: Sabrina Romero ([e-mail])
+############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+
+import time
+
+class account_asset_depreciation_line(osv.Model):
+    _inherit = 'account.asset.depreciation.line'
+    
+    def _get_move_check(self, cr, uid, ids, name, args, context=None):
+        res = super(account_asset_depreciation_line, self)._get_move_check(cr, uid, ids, name, args, context=context)
+        for line in self.browse(cr, uid, ids, context=context):
+            res[line.id] = bool(line.move_id or line.check_posted)
+        return res
+    
+    _columns={
+        'check_posted': fields.boolean('Posted'),
+        'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)
+    }
+    
+    _defaults = {
+        'check_posted': False,
+    }

=== added directory 'account_asset_move_check/security'
=== added directory 'account_asset_move_check/static'
=== added directory 'account_asset_move_check/static/src'
=== added directory 'account_asset_move_check/static/src/css'
=== added directory 'account_asset_move_check/static/src/img'
=== added file 'account_asset_move_check/static/src/img/icon.png'
Binary files account_asset_move_check/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and account_asset_move_check/static/src/img/icon.png	2014-05-13 00:34:34 +0000 differ
=== added directory 'account_asset_move_check/static/src/js'
=== added directory 'account_asset_move_check/static/src/xml'
=== added directory 'account_asset_move_check/view'
=== modified file 'account_bank_statement_vauxoo/i18n/es.po'
--- account_bank_statement_vauxoo/i18n/es.po	2014-01-29 06:05:24 +0000
+++ account_bank_statement_vauxoo/i18n/es.po	2014-05-13 00:34:34 +0000
@@ -13,6 +13,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
 
@@ -573,3 +574,565 @@
 #: field:bank.statement.imported.lines,invo_move_line:0
 msgid "Chek"
 msgstr ""
+=======
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:153
+#, python-format
+msgid ""
+"You can not make a bank reconcilation for bank                    moves with "
+"dates on different periods"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.invoice:0
+#: view:bank.statement.imported.lines:0
+#: model:ir.ui.menu,name:account_bank_statement_vauxoo.menu_bank_imported_statement_line
+msgid "Bank Statements Lines"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: constraint:account.journal.bs.config:0
+msgid ""
+"Error: La expresion no es lista\n"
+"        debe quedar algo así:\n"
+"        [\"cadenaA\",\"cadenaB\",\"CadenaC\"]\n"
+"        o es inválida"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:242
+#, python-format
+msgid ""
+"You can not make a bank reconcilation for bank moves with                 "
+"dates on different periods"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.journal,default_expense_account_id:0
+msgid ""
+"In banks you probable wants send account move lines to an\n"
+"             extra account to be able to record account move lines due to "
+"bank\n"
+"             comisions and bank debit notes, in this field you configure "
+"this\n"
+"             account."
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.journal,moveper_line:0
+msgid ""
+"Do you want one move per line or one move per bank\n"
+"                 statement,True: One Per Line False:\n"
+"                 One Per bank statement"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.move.line,stff_id:0
+msgid "Statement from File line"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.bank.statement,bs_line_ids:0
+msgid "Statement"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.invoice,bank_statement_line_ids:0
+#: help:bank.statement.imported.lines,invoice_ids:0
+msgid "Invoices to be reconciled with this line"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:bank.statement.imported.lines,invo_move_line:0
+msgid "Chek if invoice and account move line exist"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:332
+#, python-format
+msgid ""
+"Account Move Temporary For this Statement                                    "
+" Id Was Created is created %s "
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal,moveper_line:0
+msgid "One Move per Line"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Validate"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.bank.statement:0
+msgid ""
+"Create Temporary Account Move with lines exactly as bank Statement FIrst "
+"Iteration."
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Total Credit"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal.bs.config,account_id:0
+#: view:bank.statement.imported.lines:0
+msgid "Account"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.bank.statement,move:0
+msgid ""
+"This account move is the used to make the             conciliation throught "
+"the bank statement imported with excel"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Total Debit"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Change account"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.bank.statement:0
+msgid "Create Account Move From File"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:153
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:220
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:242
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:247
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:344
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:365
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:471
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal.bs.config,partner_id:0
+#: view:bank.statement.imported.lines:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.bank.statement:0
+msgid "Delete all lines Imported"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:366
+#, python-format
+msgid ""
+"File Must be an XLS file !                     Please verify save as "
+"correctly in excel your exported                    file from bank statement"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal.bs.config,sequence:0
+msgid "Label"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.bank.statement:0
+msgid ""
+"Set date from file, with this button we will read the file and set date and "
+"period to be right with the file information"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.bank.statement:0
+msgid ""
+"Import from First attached document with xls name, and structure documented."
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.bank.statement,fname:0
+msgid "File Name Imported"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.invoice,bank_statement_line_ids:0
+#: view:bank.statement.imported.lines:0
+#: field:bank.statement.imported.lines,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.invoice:0
+msgid "Reconcile Bank Statements Line"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.bank.statement,from_to_file:0
+msgid "Date Range on file"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.bank.statement,lines_toreview:0
+msgid "Lines to Review"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.bank.statement,fname:0
+msgid ""
+"Name of file imported, to be able to do that add as attach                 "
+"ment an xls file with the corect format directly imported                 "
+"from Banco Nacional"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal,default_income_account_id:0
+msgid "Extra Income Account"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.journal:0
+msgid "Concept"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: model:res.groups,name:account_bank_statement_vauxoo.group_bank_statement_import_user
+msgid "Import Bank Statement / User"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Temporal Move Line"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.bank.statement:0
+msgid "To Review"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:250
+#, python-format
+msgid ""
+"You can not make a bank reconcilation in a period different                 "
+"to the period indicated on files, please select correct                 "
+"period it should be %s "
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,acc_move_line_ids:0
+msgid "unknown"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:345
+#, python-format
+msgid ""
+"I found quatity of attachments <> 1 !             Please Attach JUST One XLS "
+"file to this bank statement."
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:334
+#, python-format
+msgid "Account Move Temporary is created %s "
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: selection:bank.statement.imported.lines,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Move line from Bank."
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.bank.statement,lines_toreview:0
+msgid "Quantity of lines to verify from file."
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:bank.statement.imported.lines,counterpart_id:0
+msgid ""
+"This will be the account to make the account move line as             "
+"counterpart."
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.bank.statement:0
+msgid "Bank Imported Lines"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal.bs.config,expresion:0
+msgid "Text To be Compared"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: model:ir.model,name:account_bank_statement_vauxoo.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.journal:0
+msgid "Concepts to automate Import Banks Statements in this journal"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.bank.statement:0
+msgid "Delete Imported From Attachment"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal,default_expense_account_id:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,numdocument:0
+msgid "Num Document"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+#: field:bank.statement.imported.lines,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,move_id:0
+msgid "Account Move"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "N Document"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.bank.statement:0
+msgid "Set date From File"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,counterpart_id:0
+msgid "Account Counterpart"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.bank.statement,from_to_file:0
+msgid ""
+"Date range read on xls file imported from your                 attachments"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+#: field:bank.statement.imported.lines,office:0
+msgid "Office"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,aml_ids:0
+msgid "Account Move Lines"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.invoice:0
+msgid "Unreconcile Bank Statements Line"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:bank.statement.imported.lines,state:0
+msgid ""
+"If this bank statement line is confirmed or not, to help             "
+"useability issues"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: model:ir.model,name:account_bank_statement_vauxoo.model_bank_statement_imported_lines
+msgid "Imported lines for banks files"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,bank_statement_id:0
+#: model:ir.model,name:account_bank_statement_vauxoo.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal,concept_ids:0
+msgid "Concept Lines"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: selection:bank.statement.imported.lines,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: model:ir.model,name:account_bank_statement_vauxoo.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: model:ir.model,name:account_bank_statement_vauxoo.model_account_journal_bs_config
+msgid "account.journal.bs.config"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:bank.statement.imported.lines,partnercounterpart_id:0
+msgid ""
+"This will be the partner to make written on the             account move "
+"line as counterpart., if you change this value,             the account "
+"payable or receivable will be automatic selected on             Account Move "
+"Lines related, specially usefull when you pay             several things in "
+"the same invoice, Petty cash for example, just             select your "
+"partner petty cash"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Account Move Line"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:471
+#, python-format
+msgid ""
+"You can not change account because this bank statement                     "
+"have documents"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal,default_interim_account_id:0
+msgid "Interim Account"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Invoices to be reconciled"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Statement Bank"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.bank.statement:0
+msgid "Import From Attachment"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.journal,default_interim_account_id:0
+msgid ""
+"In banks you probably want send account move\n"
+"                 lines to a interim account before affect the default\n"
+"                 debit and credit account who\n"
+"                 will have the booked\n"
+"                 balance for this kind of operations, in this field\n"
+"                 you configure this account."
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,name:0
+msgid "Description"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal.bs.config,bsl_id:0
+#: model:ir.model,name:account_bank_statement_vauxoo.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.journal,default_income_account_id:0
+msgid ""
+"In banks you probably want as counter part for extra\n"
+"             banking income money use an specific account in this field\n"
+"             you can canfigure this account"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.bank.statement,move:0
+msgid "Move Temp to conciliate"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:220
+#, python-format
+msgid ""
+"You can not re-create account move's, modify manually on                 "
+"lines where you need do something or delete lines and start                 "
+"again (remember delete the account move related)"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Name"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.journal:0
+msgid "Concepts"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,partnercounterpart_id:0
+msgid "Partner Counterpart"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal.bs.config,name:0
+msgid "Cancept Label"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: model:res.groups,name:account_bank_statement_vauxoo.group_bank_statement_import_manager
+msgid "Import Bank Statement / Manager"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.journal:0
+msgid "Concepts for Banks Statements"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,invo_move_line:0
+msgid "Chek"
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== modified file 'account_bank_statement_vauxoo/i18n/es_CR.po'
--- account_bank_statement_vauxoo/i18n/es_CR.po	2014-01-29 06:05:24 +0000
+++ account_bank_statement_vauxoo/i18n/es_CR.po	2014-05-13 00:34:34 +0000
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
 
@@ -24,6 +25,18 @@
 "You can not make a bank reconcilation for bank                    moves with "
 "dates on different periods"
 msgstr ""
+=======
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:153
+#, python-format
+msgid ""
+"You can not make a bank reconcilation for bank                    moves with "
+"dates on different periods"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account_bank_statement_vauxoo
 #: view:account.invoice:0

=== modified file 'account_bank_statement_vauxoo/i18n/es_MX.po'
--- account_bank_statement_vauxoo/i18n/es_MX.po	2014-01-29 06:05:24 +0000
+++ account_bank_statement_vauxoo/i18n/es_MX.po	2014-05-13 00:34:34 +0000
@@ -13,6 +13,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-01-29 06:04+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
 
@@ -573,3 +574,565 @@
 #: field:bank.statement.imported.lines,invo_move_line:0
 msgid "Chek"
 msgstr ""
+=======
+"X-Launchpad-Export-Date: 2014-05-08 06:34+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:153
+#, python-format
+msgid ""
+"You can not make a bank reconcilation for bank                    moves with "
+"dates on different periods"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.invoice:0
+#: view:bank.statement.imported.lines:0
+#: model:ir.ui.menu,name:account_bank_statement_vauxoo.menu_bank_imported_statement_line
+msgid "Bank Statements Lines"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: constraint:account.journal.bs.config:0
+msgid ""
+"Error: La expresion no es lista\n"
+"        debe quedar algo así:\n"
+"        [\"cadenaA\",\"cadenaB\",\"CadenaC\"]\n"
+"        o es inválida"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:242
+#, python-format
+msgid ""
+"You can not make a bank reconcilation for bank moves with                 "
+"dates on different periods"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.journal,default_expense_account_id:0
+msgid ""
+"In banks you probable wants send account move lines to an\n"
+"             extra account to be able to record account move lines due to "
+"bank\n"
+"             comisions and bank debit notes, in this field you configure "
+"this\n"
+"             account."
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.journal,moveper_line:0
+msgid ""
+"Do you want one move per line or one move per bank\n"
+"                 statement,True: One Per Line False:\n"
+"                 One Per bank statement"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.move.line,stff_id:0
+msgid "Statement from File line"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.bank.statement,bs_line_ids:0
+msgid "Statement"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.invoice,bank_statement_line_ids:0
+#: help:bank.statement.imported.lines,invoice_ids:0
+msgid "Invoices to be reconciled with this line"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:bank.statement.imported.lines,invo_move_line:0
+msgid "Chek if invoice and account move line exist"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:bank.statement.imported.lines,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: code:addons/account_bank_statement_vauxoo/model/account_bank_statement.py:332
+#, python-format
+msgid ""
+"Account Move Temporary For this Statement                                    "
+" Id Was Created is created %s "
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal,moveper_line:0
+msgid "One Move per Line"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Validate"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:account.bank.statement:0
+msgid ""
+"Create Temporary Account Move with lines exactly as bank Statement FIrst "
+"Iteration."
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: view:bank.statement.imported.lines:0
+msgid "Total Credit"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: field:account.journal.bs.config,account_id:0
+#: view:bank.statement.imported.lines:0
+msgid "Account"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo
+#: help:account.bank.statement,move:0
+msgid ""
+"This account move is the used to make the             conciliation throught "
+"the bank statement imported with excel"
+msgstr ""
+
+#. module: account_bank_statement_vauxoo