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-BS_ER_closed_period 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-BS_ER_closed_period/+merge/139934

[FIX] Fix wizard for Profit Staments and SituationBalance report. Add fiscal year and all period that match with the fiscal year
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-costa-rica/6.1-BS_ER_closed_period/+merge/139934
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica.

=== modified file 'l10n_cr_account_financial_statements/wizard/profit_statement_report_wizard.py'
--- l10n_cr_account_financial_statements/wizard/profit_statement_report_wizard.py	2012-11-13 22:28:19 +0000
+++ l10n_cr_account_financial_statements/wizard/profit_statement_report_wizard.py	2012-12-14 15:46:39 +0000
@@ -30,7 +30,6 @@
     _description = "Profit Statement"
 
     _defaults = {
-            'fiscalyear_id': '',
             'filter': 'filter_period',
     }
 

=== modified file 'l10n_cr_account_financial_statements/wizard/profit_statement_report_wizard_view.xml'
--- l10n_cr_account_financial_statements/wizard/profit_statement_report_wizard_view.xml	2012-11-13 22:28:19 +0000
+++ l10n_cr_account_financial_statements/wizard/profit_statement_report_wizard_view.xml	2012-12-14 15:46:39 +0000
@@ -29,10 +29,10 @@
                         <attribute name="invisible">True</attribute>
                     </page>
                     <field name="fiscalyear_id" position="attributes">
-                        <attribute name="attrs">{'invisible': True}</attribute>
-                    </field>
+                        <attribute name="attrs">{'required': True}</attribute>
+                    </field>                
                     <field name="period_from" position="replace">
-                        <field name="period_from" string="Period" domain="[('state', '=', 'draft'),('special', '=', False)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4" widget="selection"/>
+                        <field name="period_from" string="Period" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
                     </field>
                     <field name="period_to" position="attributes">
                         <attribute name="attrs">{'invisible': True, 'required': False}</attribute>

=== modified file 'l10n_cr_account_financial_statements/wizard/situation_balance_report_wizard.py'
--- l10n_cr_account_financial_statements/wizard/situation_balance_report_wizard.py	2012-11-14 01:07:08 +0000
+++ l10n_cr_account_financial_statements/wizard/situation_balance_report_wizard.py	2012-12-14 15:46:39 +0000
@@ -30,7 +30,6 @@
     _description = "Situation Balance Report"
 
     _defaults = {
-            'fiscalyear_id': '',
             'filter': 'filter_period',
     }
 

=== removed file 'l10n_cr_account_financial_statements/wizard/situation_balance_report_wizard_view.xml'
--- l10n_cr_account_financial_statements/wizard/situation_balance_report_wizard_view.xml	2012-11-12 16:14:12 +0000
+++ l10n_cr_account_financial_statements/wizard/situation_balance_report_wizard_view.xml	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- inheriting views from more than 2 differents inherited models like
-        account.balances.webkit -> account.common.balance.report -> account.common.account.report
-        is not supported so we have to copy paste the same view for payroll_report_for_month, balance sheet, profit & loss
-          -->
-        <record id="situation_balance_report_view_webkit" model="ir.ui.view">
-            <field name="name">Situation Balance Report</field>
-            <field name="model">situation.balance.report</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.account_common_report_view"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form/label[@string='']" position="replace">
-                        <separator string="Situation Balance Report" colspan="4"/>
-                        <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your income statement"/>
-                    </xpath>                    
-                    <field name="chart_account_id" position='attributes'>
-                        <attribute name="colspan">4</attribute>
-                    </field>
-                    <field name="target_move" position="attributes">
-                        <attribute name="invisible">True</attribute>
-                    </field>
-                    <page name="journal_ids" position="attributes">
-                        <attribute name="invisible">True</attribute>
-                    </page>
-                    <field name="fiscalyear_id" position="attributes">
-                        <attribute name="attrs">{'invisible': True}</attribute>
-                    </field>
-                    <field name="period_from" position="replace">
-                        <field name="period_from" string="Period" domain="[('state', '=', 'draft'),('special', '=', False)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4" widget="selection"/>
-                    </field>
-                    <field name="period_to" position="attributes">
-                        <attribute name="attrs">{'invisible': True, 'required': False}</attribute>
-                    </field>
-                     <field name="filter" position="attributes">
-                        <attribute name="readonly">True</attribute>
-                    </field>
-                    <separator string="Dates" position="attributes">
-                        <attribute name="invisible">True</attribute>
-                    </separator> 
-                    <field name="date_from" position="attributes">
-                        <attribute name="invisible">True</attribute>
-                    </field>
-                    <field name="date_to" position="attributes">
-                        <attribute name="invisible">True</attribute>
-                    </field>
-                </data>
-            </field>
-        </record>
-
-        <record id="action_situation_balance_report_menu_webkit" model="ir.actions.act_window">
-            <field name="name">Action Situation Balance Report</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">situation.balance.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="situation_balance_report_view_webkit"/>
-            <field name="target">new</field>
-        </record>
-        
-        <record model="ir.values" id="action_situation_balance_report_values_webkit">
-            <field name="model_id" ref="account.model_account_account"/>
-            <field name="object" eval="1"/>
-            <field name="name">Situation Balance Report</field>
-            <field name="key2">client_print_multi</field>
-            <field name="value"
-                eval="'ir.actions.act_window,' +str(ref('action_situation_balance_report_menu_webkit'))"/>
-            <field name="key">action</field>
-            <field name="model">account.account</field>
-        </record>
-    </data>
-</openerp>

=== modified file 'l10n_cr_account_financial_statements/wizard/situation_balance_statement_report_wizard_view.xml'
--- l10n_cr_account_financial_statements/wizard/situation_balance_statement_report_wizard_view.xml	2012-11-14 01:13:06 +0000
+++ l10n_cr_account_financial_statements/wizard/situation_balance_statement_report_wizard_view.xml	2012-12-14 15:46:39 +0000
@@ -27,10 +27,10 @@
                         <attribute name="invisible">True</attribute>
                     </page>
                     <field name="fiscalyear_id" position="attributes">
-                        <attribute name="attrs">{'invisible': True}</attribute>
+                        <attribute name="attrs">{'required': True}</attribute>
                     </field>
                     <field name="period_from" position="replace">
-                        <field name="period_from" string="Period" domain="[('state', '=', 'draft'),('special', '=', False)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4" widget="selection"/>
+                        <field name="period_from" string="Period" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
                     </field>
                     <field name="period_to" position="attributes">
                         <attribute name="attrs">{'invisible': True, 'required': False}</attribute>