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-costa-rica/6.1-conciliation_bank into lp:openerp-costa-rica.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~dr.clearcorp/openerp-costa-rica/6.1-conciliation_bank/+merge/143746

[FIX] Fix conciliation_bank. Add new changes for get the lines (used the new changes in account_webkit_report_library
[ADD] Add historic_strict  and special_period features.
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-costa-rica/6.1-conciliation_bank/+merge/143746
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica.

=== modified file 'l10n_cr_account_banking_reports/i18n/es_CR.po'
--- l10n_cr_account_banking_reports/i18n/es_CR.po	2012-07-26 20:59:03 +0000
+++ l10n_cr_account_banking_reports/i18n/es_CR.po	2013-01-17 19:07:30 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 14:52+0000\n"
-"PO-Revision-Date: 2012-07-26 14:52+0000\n"
+"POT-Creation-Date: 2013-01-11 19:33+0000\n"
+"PO-Revision-Date: 2013-01-11 19:33+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@
 "Plural-Forms: \n"
 
 #. module: l10n_cr_account_banking_reports
+#: model:ir.actions.report.xml,name:l10n_cr_account_banking_reports.account_report_conciliation_bank_webkit
+msgid "Conciliation Bank Webkit"
+msgstr "Conciliarión Bancaria"
+
+#. module: l10n_cr_account_banking_reports
 #: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:90
 msgid "- Expenditures to register"
 msgstr "- Egresos por registrar"
@@ -36,11 +41,21 @@
 msgstr "Filtros de Tiempo"
 
 #. module: l10n_cr_account_banking_reports
+#: help:conciliation.bank.webkit,historic_strict:0
+msgid "If selected, will display a historical unreconciled lines, taking into account the end of the period or date selected"
+msgstr "Si está seleccionado, mostrará el histórico de las líneas sin conciliar, tomando en cuenta la fecha final del período o la fecha final seleccionada"
+
+#. module: l10n_cr_account_banking_reports
 #: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:78
 msgid "Ledger Balance"
 msgstr "Saldo en Libros"
 
 #. module: l10n_cr_account_banking_reports
+#: field:conciliation.bank.webkit,special_period:0
+msgid "Special period"
+msgstr "Período especiales"
+
+#. module: l10n_cr_account_banking_reports
 #: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:124
 #: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:197
 msgid "Incomes to register"
@@ -131,6 +146,11 @@
 msgstr "Año Fiscal"
 
 #. module: l10n_cr_account_banking_reports
+#: field:conciliation.bank.webkit,historic_strict:0
+msgid "Strict History"
+msgstr "Histórico estricto"
+
+#. module: l10n_cr_account_banking_reports
 #: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:80
 msgid "Bank Balance"
 msgstr "Saldo en Banco"
@@ -182,6 +202,11 @@
 msgstr "Filtro por Fechas"
 
 #. module: l10n_cr_account_banking_reports
+#: help:conciliation.bank.webkit,special_period:0
+msgid "Include special period"
+msgstr "Include special period"
+
+#. module: l10n_cr_account_banking_reports
 #: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:84
 msgid "+ Incomes to register"
 msgstr "+ Ingresos por registrar"

=== modified file 'l10n_cr_account_banking_reports/report/conciliation_bank.mako'
--- l10n_cr_account_banking_reports/report/conciliation_bank.mako	2012-07-18 22:46:28 +0000
+++ l10n_cr_account_banking_reports/report/conciliation_bank.mako	2013-01-17 19:07:30 +0000
@@ -58,7 +58,7 @@
     </div>
     
     <%
-        bank_balance, bank_move_lines, account_is_foreign = get_bank_data(cr, uid, bank_account.id, filter_type, filter_data, fiscalyear, target_move, context)
+        bank_balance, bank_move_lines, account_is_foreign = get_bank_data(cr, uid, bank_account.id, filter_type, filter_data, fiscalyear, target_move, data['form']['historic_strict'], data['form']['special_period'])
     %>
     <div align="center">
         <div class="act_as_table data_table no_wrap results left" style="margin-top:20px; margin-bottom: 10px; width:500px">

=== modified file 'l10n_cr_account_banking_reports/report/conciliation_bank.py'
--- l10n_cr_account_banking_reports/report/conciliation_bank.py	2012-11-22 19:38:23 +0000
+++ l10n_cr_account_banking_reports/report/conciliation_bank.py	2013-01-17 19:07:30 +0000
@@ -144,7 +144,8 @@
 
         return res
 
-    def get_bank_data(self, cr, uid, parent_account_id, filter_type, filter_data, fiscalyear, target_move, context=None):
+    def get_bank_data(self, cr, uid, parent_account_id, filter_type, filter_data, fiscalyear, target_move, historic_strict, special_period, context=None):
+        print (filter_data)
         result_bank_balance = {}
         result_move_lines = []
         filters = {}
@@ -195,21 +196,15 @@
         debits_to_reconcile = 0.0
         accounting_total = 0.0
         bank_total = 0.0
-        
-        '''
-        #Filters for the move lines to use in get_account_balance 
-        filters['fiscalyear'] = fiscalyear.id
-        if filter_type == 'filter_date':
-            filters['date_from'] = filter_data[0] 
-            filters['date_to'] = filter_data[1]
-        elif filter_type == 'filter_period':
-            periods_ids = self.pool.get('account.period').search(cr, uid, [('date_stop', '<=', filter_data[1].date_stop)])
-            filters['periods'] = periods_ids 
-        '''
-        fiscal_year_id = fiscalyear.id
+
+        if fiscalyear: 
+            fiscal_year_id = fiscalyear.id
+        else:
+            fiscal_year_id = False
+            
         if filter_type == 'filter_date':
             period_ids = False
-            end_date = filter_data[1].id
+            end_date = filter_data[1]
         elif filter_type == 'filter_period':
             period_ids = self.pool.get('account.period').search(cr, uid, [('date_stop', '<=', filter_data[1].date_stop)])
             end_date = False
@@ -266,7 +261,27 @@
         move_obj = self.pool.get('account.move')
         move_line_obj = self.pool.get('account.move.line')
         
-        unreconciled_move_lines = account_webkit_report_library_obj.get_move_lines(cr, uid, transit_account_ids, filter_type=filter_type, filter_data=filter_data, fiscalyear=fiscalyear, target_move=target_move, unreconcile = True, context=context)
+        """
+            Cambio realizado el 9 de enero de 2012
+            
+            Anteriormente, el método get_move_lines (del objeto account.webkit.report.library, librería estándar de los reportes, 
+            sólo se utilizaba en el reporte de Conciliación bancaria. El reporte de conciliación bancaria no recibe el período de inicio
+            por lo que el método de get_move_lines no contempla el período de inicio, necesario en el reporte de saldo de cuenta de bancos.
+            Se realiza el cambio tanto en el reporte de conciliación bancaria para que el período inicial no se tome en cuenta (inicializado en None)
+            y en la librería se especifica que si se encuentra en None no lo tome en cuenta y que si trae información lo utilice dentro del filtro
+            para sacar el rango de periodos que se digita en el wizard. 
+            
+            Se modifica tanto el reporte de conciliación bancaria, como la librería, para que el método funcione solamente con un período final o bien
+            con un rango de períodos, como trabaja el reporte de saldo de cuenta de bancos. 
+            
+            Para el caso de las fechas, se trabaja de la misma forma. (El saldo de cuentas de bancos si toma la fecha de inicio)
+            
+            OBSERVACIÓN -> data['form']['historic_strict'],las variables boleanas (historic_strict y special_period) se deben pasar
+            de esta forma, sino vienen como objetos y no con el valor real (True or False). Esto se hace desde el conciliation_bank.mako
+            
+        """
+        filter_data[0] = None 
+        unreconciled_move_lines = account_webkit_report_library_obj.get_move_lines(cr, uid, transit_account_ids, filter_type=filter_type, filter_data=filter_data, fiscalyear=fiscalyear, target_move=target_move, unreconcile = True, historic_strict=historic_strict, special_period=special_period, context=context)
         
         result_move_lines = {
             'credits_to_reconcile' :     [],
@@ -383,6 +398,8 @@
             'bank_total' : bank_total,
         }
         
+        #special_period = historic_strict = False
+        
         return result_bank_balance, result_move_lines, account_is_foreign
     
     def get_bank_account(self, cr, uid, data):

=== modified file 'l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.py'
--- l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.py	2012-11-22 19:38:23 +0000
+++ l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.py	2013-01-17 19:07:30 +0000
@@ -34,6 +34,8 @@
         'bank_account_ids': fields.many2one('account.account', 'Bank Account', domain="[('user_type.code','=','BKVI')]", help="Bank Account"),
         'bank_balance': fields.float('Bank Balance'),
         'filter': fields.selection([('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by", required=True),
+        'historic_strict': fields.boolean('Strict History', help="If selected, will display a historical unreconciled lines, taking into account the end of the period or date selected"),
+        'special_period': fields.boolean('Special period', help="Include special period"),
     }
     
     _defaults = {
@@ -45,9 +47,9 @@
         if context is None:
             context = {}
         # will be used to attach the report on the main account
-        data['ids'] = [data['form']['chart_account_id']]
+        data['ids'] = [data['form']['chart_account_id']]        
         vals = self.read(cr, uid, ids,
-                         ['bank_account_ids', 'bank_balance',],
+                         ['bank_account_ids', 'bank_balance','historic_strict', 'special_period'],
                          context=context)[0]
         data['form'].update(vals)
         return data

=== modified file 'l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.xml'
--- l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.xml	2012-07-18 22:46:28 +0000
+++ l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.xml	2013-01-17 19:07:30 +0000
@@ -13,6 +13,9 @@
                         <separator string="Conciliation Bank" colspan="4"/>
                         <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your partner ledger with details of all your payable/receivable account"/>
                     </xpath>
+                    <field name="target_move" position="after">
+                        <field name="historic_strict"></field>
+                    </field>
                     <field name="chart_account_id" position='attributes'>
                         <attribute name="colspan">4</attribute>
                     </field>
@@ -35,6 +38,9 @@
                     <field name="period_to" position="attributes">
                         <attribute name="domain">[('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)]</attribute>
                     </field>
+                    <field name="period_to" position="after">
+                        <field name="special_period" attrs="{'readonly':[('filter', '!=', 'filter_period')]}"></field>
+                    </field>
                 </data>
             </field>
         </record>