openobject-italia-core-devs team mailing list archive

[Andrea Cometa <info@xxxxxxxxxxxxxxx>]

Andrea Cometa has proposed merging lp:~scigghia/openobject-italia/openobject-italia-6.1-imp-riba-filtri into lp:openobject-italia/6.1.

Requested reviews:
  OpenERP Italia core devs (openobject-italia-core-devs)

For more details, see:
https://code.launchpad.net/~scigghia/openobject-italia/openobject-italia-6.1-imp-riba-filtri/+merge/163501

Ho semplicemente aggiunto il filtro "Riba Emesse" nella view di emissione riba
-- 
https://code.launchpad.net/~scigghia/openobject-italia/openobject-italia-6.1-imp-riba-filtri/+merge/163501
Your team OpenERP Italia core devs is requested to review the proposed merge of lp:~scigghia/openobject-italia/openobject-italia-6.1-imp-riba-filtri into lp:openobject-italia/6.1.

=== 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)