clearcorp team mailing list archive

[Diana Rodríguez Martínez <diana.rodriguez@xxxxxxxxxxxxxxx>]

Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-ccorp-addons/6.1-partner_ledger_report into lp:openerp-ccorp-addons/6.1.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-partner_ledger_report/+merge/164271

[FIX] Fix variable reconcile_id for partial conciliation
[ADD] Add translations
[FIX] Fix parameter name "end_date"
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-partner_ledger_report/+merge/164271
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons/6.1.

=== added directory 'account_general_ledger_report/i18n'
=== added file 'account_general_ledger_report/i18n/es_CR.po'
--- account_general_ledger_report/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/i18n/es_CR.po	2013-05-16 21:26:46 +0000
@@ -0,0 +1,148 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_general_ledger_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-16 21:14+0000\n"
+"PO-Revision-Date: 2013-05-16 21:14+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_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:29
+msgid "Filter by: "
+msgstr "Filtrado por: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:95
+msgid "Label"
+msgstr "Etiqueta"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:100
+msgid "Debit"
+msgstr "Débito"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:77
+msgid "Initial balance:"
+msgstr "Balance inicial:"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:57
+msgid "Target moves: "
+msgstr "Movimientos destino: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:79
+msgid "No move lines for this account"
+msgstr "No existen líneas de asiento para esta cuenta"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:90
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:141
+msgid "TOTAL"
+msgstr "TOTAL"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:28
+msgid "Fiscal Year: "
+msgstr "Año fiscal: "
+
+#. module: account_general_ledger_report
+#: constraint:general.ledger.webkit:0
+msgid "When no Fiscal year is selected, you must choose to filter by periods or by date."
+msgstr "Cuando no se selecciona ningún año fiscal, se debe elegir para filtrar por períodos o por fecha."
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:48
+msgid "Accounts: "
+msgstr "Cuentas: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:15
+msgid "General Ledger Report "
+msgstr "Informe del libro mayor"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:92
+msgid "Entry"
+msgstr "Asiento"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:45
+msgid "No filter"
+msgstr "Sin filtros"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:102
+msgid "Cumul. Bal."
+msgstr "Bal Acumul."
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:101
+msgid "Credit"
+msgstr "Crédito"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:42
+msgid "Period: "
+msgstr "Período: "
+
+#. module: account_general_ledger_report
+#: constraint:general.ledger.webkit:0
+msgid "The fiscalyear, periods or chart of account chosen have to belong to the same company."
+msgstr "El año fiscal, períodos o plan contable elegidos deben pertenecer a la misma compañía."
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:54
+msgid "All"
+msgstr "Todo"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:27
+msgid "Chart of Accounts: "
+msgstr "Catálogo de cuentas: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:98
+msgid "Reconcile"
+msgstr "Conciliación"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:35
+msgid "Dates: "
+msgstr "Fechas: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:91
+msgid "Period"
+msgstr "Períodos"
+
+#. module: account_general_ledger_report
+#: model:ir.actions.act_window,name:account_general_ledger_report.action_general_ledger_report_wizard
+#: model:ir.model,name:account_general_ledger_report.model_general_ledger_webkit
+msgid "General Ledger Report"
+msgstr "Informe del libro mayor"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:94
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:93
+msgid "Journal"
+msgstr "Diario"
+

=== modified file 'account_general_ledger_report/report/account_general_ledger_report.mako'
--- account_general_ledger_report/report/account_general_ledger_report.mako	2013-05-16 19:40:15 +0000
+++ account_general_ledger_report/report/account_general_ledger_report.mako	2013-05-16 21:26:46 +0000
@@ -87,9 +87,9 @@
                     <div class="table list">
                         <div class="table-header">
                             <div class="table-row labels no-wrap">                       
-                                <div class="table-cell first-column" style="width: 70px">${_('Date')}</div>
-                                <div class="table-cell" style="width: 70px">${_('Period')}</div>
-                                <div class="table-cell" style="width: 70px">${_('Entry')}</div>
+                                <div class="table-cell first-column" style="width: 55px">${_('Date')}</div>
+                                <div class="table-cell" style="width: 55px">${_('Period')}</div>
+                                <div class="table-cell" style="width: 100px">${_('Entry')}</div>
                                 <div class="table-cell" style="width: 70px">${_('Journal')}</div>
                                 <div class="table-cell" style="width: 100px">${_('Partner')}</div>                    
                                 <div class="table-cell" style="width: 100px">${_('Label')}</div>

=== modified file 'account_general_ledger_report/report/account_general_ledger_report.py'
--- account_general_ledger_report/report/account_general_ledger_report.py	2013-05-16 19:40:15 +0000
+++ account_general_ledger_report/report/account_general_ledger_report.py	2013-05-16 21:26:46 +0000
@@ -123,7 +123,7 @@
                  account_conciliation[line.account_id.id][line.id] = line.reconcile_id.name
              
             elif line.reconcile_partial_id and line.reconcile_partial_id.name != '':
-                str_name = 'P: ' + line.reconcile_id.name
+                str_name = 'P: ' + line.reconcile_partial_id.name
                 #conciliation_lines.append(str_name)
                 account_conciliation[line.account_id.id][line.id] = str_name             
             
@@ -142,7 +142,7 @@
                                                               fiscal_year_id = fiscalyear.id,
                                                               state = target_move,
                                                               start_date = start_date,
-                                                              stop_date = stop_date,
+                                                              end_date = stop_date,
                                                               chart_account_id = chart_account.id,
                                                               filter_type=filter_type)
         elif filter_type == 'filter_period':