Merge lp:~csierra-h/openobject-addons/extra-trunk into lp:openobject-addons/extra-trunk

[Carlos Sierra Andrés]

Minimal update for account_balance_reporting to work on V7

Unmerged revisions

5863. By Carlos Sierra <sac@openerp6> on 2013-04-30

Modificaciones mínimas para que el módulo funcione en la version 7 de OpenERP

=== modified file 'account_balance_reporting/account_balance_reporting_view.xml'
--- account_balance_reporting/account_balance_reporting_view.xml	2012-05-22 10:37:49 +0000
+++ account_balance_reporting/account_balance_reporting_view.xml	2013-05-02 14:51:26 +0000
@@ -63,7 +63,7 @@
                             </group>
                             <group colspan="4">
                                 <!-- <button name="calculate" string="Calculate" states="draft"/> -->
-                                <button name="%(wiz_account_balance_reporting_calculate)d" type="action" string="Calculate" states="draft" icon="gtk-execute"/>
+                                <button name="calculate" string="Calculate" states="draft" icon="gtk-execute"/>
                                 <button name="confirm" string="Confirm" states="calc_done" icon="gtk-apply"/>
                                 <button name="cancel" string="Cancel" states="calc_done,done" icon="gtk-cancel"/>
 								<button name="action_recover" string="Draft" type="object" states="canceled" icon="gtk-undo"/>

=== modified file 'account_balance_reporting/account_balance_reporting_wizard.xml'
--- account_balance_reporting/account_balance_reporting_wizard.xml	2012-05-22 10:37:49 +0000
+++ account_balance_reporting/account_balance_reporting_wizard.xml	2013-05-02 14:51:26 +0000
@@ -50,12 +50,5 @@
             view_mode="form"
             target="new"
             id="account_balance_reporting_print_wizard_act_window" />
-
-        <!-- Calculate wizard -->
-        <wizard id="wiz_account_balance_reporting_calculate"
-                model="account.balance.reporting"
-                string="Calculate report"
-                name="account_balance_reporting.calculate_wizard"
-                menu="False"/>
     </data>
 </openerp>

=== modified file 'account_balance_reporting/report/generic_non_zero_report.rml'
--- account_balance_reporting/report/generic_non_zero_report.rml	2012-10-30 17:17:03 +0000
+++ account_balance_reporting/report/generic_non_zero_report.rml	2013-05-02 14:51:26 +0000
@@ -94,7 +94,7 @@
   <images/>
   <story>
     <para style="Standard">[[repeatIn(objects,'report')]]</para>
-    <para style="Standard">[[setLang(user.context_lang)]]</para>
+    <para style="Standard">[[setLang(user.lang)]]</para>
     <para style="Standard">
       <font color="white"> </font>
     </para>

=== modified file 'account_balance_reporting/report/generic_report.rml'
--- account_balance_reporting/report/generic_report.rml	2012-10-30 17:17:03 +0000
+++ account_balance_reporting/report/generic_report.rml	2013-05-02 14:51:26 +0000
@@ -94,7 +94,7 @@
   <images/>
   <story>
     <para style="Standard">[[repeatIn(objects,'report')]]</para>
-    <para style="Standard">[[setLang(user.context_lang)]]</para>
+    <para style="Standard">[[setLang(user.lang)]]</para>
     <para style="Standard">
       <font color="white"> </font>
     </para>

=== modified file 'account_balance_reporting/wizard/__init__.py'
--- account_balance_reporting/wizard/__init__.py	2012-01-18 19:10:46 +0000
+++ account_balance_reporting/wizard/__init__.py	2013-05-02 14:51:26 +0000
@@ -27,5 +27,4 @@
 __author__ = "Borja López Soilán (Pexego) - [e-mail]"
 
 
-import wizard_calculate
 import wizard_print