Merge lp:~scigghia/openobject-italia/openobject-italia-6.1-imp-riba-filtri into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-6.1

[Andrea Cometa]

Ho semplicemente aggiunto il filtro "Riba Emesse" nella view di emissione riba

[Lorenzo Battistini (elbati)]

Mi sembra ci siano anche le modifiche già contenute in questa MP
https://code.launchpad.net/~scigghia/openobject-italia/6.1/+merge/157623

review: Needs Fixing

[Andrea Cometa (scigghia)]

Il 13/05/2013 14:52, Lorenzo Battistini - Agile BG ha scritto:
> Review: Needs Fixing
>
> Mi sembra ci siano anche le modifiche già contenute in questa MP
> https://code.launchpad.net/~scigghia/openobject-italia/6.1/+merge/157623
Già! ho in attesa anche quel merge proposal...

--
Andrea Cometa Perito Informatico
Via Platone, 24/A - 74023 - Grottaglie (TA) - Italy
Cell: 3389553466 Tel: [phone] Fax: [phone]
<email address hidden> http://www.andreacometa.it
pec: <email address hidden>
linkedin: http://it.linkedin.com/in/andreacometa

[Andrea Cometa (scigghia)]

riepilogo tutto:

- ho aggiunto il filtro "Riba Emesse" nella view di emissione riba
- ho filtrato le righe di riba da emettere, quando hanno un reconcile_id
- aggiunto importo residuo in emissione riba, modificato anche il wizard affinchè calcoli amount_residual al posto di debit

[Lorenzo Battistini (elbati)]

review: Approve

[Alessandro Camilli (a-camilli)]

Grazie

=== modified file 'l10n_it_ricevute_bancarie/account/account_view.xml'
--- l10n_it_ricevute_bancarie/account/account_view.xml	2013-03-09 11:48:05 +0000
+++ l10n_it_ricevute_bancarie/account/account_view.xml	2013-05-13 10:30:34 +0000
@@ -56,9 +56,11 @@
                 <field name="payment_term_id" readonly="1"/>
                 <field name="account_id" readonly="1"/>
                 <field name="debit" readonly="1" sum="Total Debit"/>
+                <field name="amount_residual" readonly="1" sum="Total Amount" />
                 <field name="date_maturity"/>
                 <field name="riba" />
                 <field name="distinta_line_ids" invisible="1" />
+                <field name="reconcile_id" invisible="1" />
             </tree>
         </field>
     </record>
@@ -73,6 +75,8 @@
             <search string="Search Journal Items">
                 <filter icon="terp-go-today" string="To Issue" 
                     domain="[('distinta_line_ids', '=', False)]" name="da_emettere"/>
+                <filter icon="terp-go-today" string="Issued" 
+                    domain="[('distinta_line_ids', '!=', False)]" name="emesse"/>
                 <field name="account_id"/>
                 <field name="partner_id"/>
                 <field name="invoice"/>
@@ -98,7 +102,7 @@
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_riba_da_emettere_tree" />
         <field name="context">{'search_default_da_emettere':1}</field>
-        <field name="domain">['&amp;','|',('riba','=','True'),('unsolved_invoice_ids','!=',False),('account_id.type','=','receivable')]</field>
+        <field name="domain">['&amp;','|',('riba','=','True'),('unsolved_invoice_ids','!=',False),('account_id.type','=','receivable'), ('reconcile_id', '=', False)]</field>
         <field name="search_view_id" ref="riba_filter"/>
     </record>
 

=== modified file 'l10n_it_ricevute_bancarie/wizard/wizard_emissione_riba.py'
--- l10n_it_ricevute_bancarie/wizard/wizard_emissione_riba.py	2013-01-04 14:02:10 +0000
+++ l10n_it_ricevute_bancarie/wizard/wizard_emissione_riba.py	2013-05-13 10:30:34 +0000
@@ -99,7 +99,7 @@
                         for grouped_line in grouped_lines[key]:
                             riba_distinta_move_line.create(cr, uid, {
                                 'riba_line_id': rdl_id,
-                                'amount': grouped_line.debit,
+                                'amount': grouped_line.amount_residual,
                                 'move_line_id': grouped_line.id,
                                 }, context=context)
                         del grouped_lines[key]
@@ -108,7 +108,7 @@
                 rdl_id = create_rdl(conta, bank_id.id, rd_id, move_line.date_maturity, move_line.partner_id.id, wizard_obj.configurazione.acceptance_account_id.id)
                 riba_distinta_move_line.create(cr, uid, {
                     'riba_line_id': rdl_id,
-                    'amount': move_line.debit,
+                    'amount': move_line.amount_residual,
                     'move_line_id': move_line.id,
                     }, context=context)