Merge lp:~domsense/openobject-italia/6.1-fix-primanota-lep into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-6.1

[Leonardo Pistone]

[Davide Corio (enlightx-deactivatedaccount)]

Working as expected on both 6.1 and 7.0

review: Approve

=== modified file 'l10n_it_prima_nota_cassa/wizard/wizard_print_prima_nota_cassa.py'
--- l10n_it_prima_nota_cassa/wizard/wizard_print_prima_nota_cassa.py	2012-03-17 17:18:36 +0000
+++ l10n_it_prima_nota_cassa/wizard/wizard_print_prima_nota_cassa.py	2012-12-13 20:45:23 +0000
@@ -42,7 +42,7 @@
         return { 'type': 'ir.actions.report.xml', 'report_name': 'account.print.prima_nota_cassa', 'datas': data}
 
     _columns = {
-
+        'initial_balance': fields.boolean('Include initial balances', help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
     }
     _defaults = {
         'journal_ids': _get_all_journal,
 
=== modified file 'l10n_it_prima_nota_cassa/wizard/wizard_print_prima_nota_cassa.xml'
--- l10n_it_prima_nota_cassa/wizard/wizard_print_prima_nota_cassa.xml	2012-03-17 17:18:36 +0000
+++ l10n_it_prima_nota_cassa/wizard/wizard_print_prima_nota_cassa.xml	2012-12-13 20:45:23 +0000
@@ -17,6 +17,9 @@
             <field name="journal_ids" position="replace">
                 <field name="journal_ids" domain="[('type','in',['cash'])]"    />
             </field>
+            <field name="target_move" position="after">
+                <field name="initial_balance"/>
+            </field>
             </data>
             </field>
         </record>