← Back to team overview

clearcorp team mailing list archive

[Merge] lp:~dr.clearcorp/openerp-costa-rica/6.1-fix_bugs_reports into lp:openerp-costa-rica/6.1

 

Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-costa-rica/6.1-fix_bugs_reports into lp:openerp-costa-rica/6.1.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

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

[FIX] Fix conciliation_bank report with currency option
[FIX] Fix wizard for conciliation_bank. Add fiscal_year_id as requiered field.
[Fix] Fix partner ledger report. Remark initial balance
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-costa-rica/6.1-fix_bugs_reports/+merge/165908
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica/6.1.
=== modified file 'l10n_cr_account_banking_reports/report/conciliation_bank.py'
--- l10n_cr_account_banking_reports/report/conciliation_bank.py	2013-05-17 18:52:52 +0000
+++ l10n_cr_account_banking_reports/report/conciliation_bank.py	2013-05-27 16:03:30 +0000
@@ -217,7 +217,7 @@
                                                 uid,
                                                 [reconciled_account.id],
                                                 ['foreign_balance'],
-                                                end_date=end_daforeing_balancete,
+                                                end_date=end_date,
                                                 end_period_id=end_period.id,
                                                 fiscal_year_id=fiscal_year_id,
                                                 filter_type=filter_type,

=== modified file 'l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.xml'
--- l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.xml	2013-01-17 19:04:40 +0000
+++ l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.xml	2013-05-27 16:03:30 +0000
@@ -41,6 +41,9 @@
                     <field name="period_to" position="after">
                         <field name="special_period" attrs="{'readonly':[('filter', '!=', 'filter_period')]}"></field>
                     </field>
+                    <field name="fiscalyear_id" position="attributes">
+                        <attribute name="required">1</attribute>
+                    </field>
                 </data>
             </field>
         </record>

=== modified file 'l10n_cr_account_financial_report_partner_ledger/report/l10n_cr_account_report_partners_ledger.mako'
--- l10n_cr_account_financial_report_partner_ledger/report/l10n_cr_account_report_partners_ledger.mako	2013-04-01 20:03:26 +0000
+++ l10n_cr_account_financial_report_partner_ledger/report/l10n_cr_account_report_partners_ledger.mako	2013-05-27 16:03:30 +0000
@@ -187,14 +187,14 @@
                         <div class="act_as_cell" style="width: 70px;">${_('')}</div>
                         ## journal
                         <div class="act_as_cell" style="width: 70px;">${_('')}</div>
-                        <div class="act_as_cell" style="width: 270px;">${_('Initial Balance')}</div>
+                        <div class="act_as_cell" style="width: 270px; font-size:10px; font-weight: bold;">${_('Initial Balance')}</div>
                         <div class="act_as_cell" style="width: 70px;">${_('')}</div>
                         <div class="act_as_cell amount" style="width: 100px;">${_('')}</div>
                         <div class="act_as_cell amount" style="width: 100px;">${_('')}</div>
                         <div class="act_as_cell amount" style="width: 100px;">${_('')}</div>
                         <div class="act_as_cell amount" style="width: 100px;">${_('')}</div>
                         <div class="act_as_cell amount" style="width: 115px;">${_('')}</div>
-                        <div class="act_as_cell amount" style="width: 115px;">${formatLang(init_balance)}</div>
+                        <div class="act_as_cell amount" style="width: 115px; font-size:10px; font-weight: bold;">${formatLang(init_balance)}</div>
                         
                         <%total_accumulated_balance = init_balance %>
                         


Follow ups