OpenERP Italia

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

  1. 6.1
  2. Merge into italian-addons-6.1
Proposed by Andrea Cometa
Status: Rejected
Rejected by: Lorenzo Battistini
Proposed branch: lp:~scigghia/openobject-italia/6.1
Merge into: lp:~openobject-italia-core-devs/openobject-italia/italian-addons-6.1
Diff against target: 45 lines (+5/-3)
2 files modified
l10n_it_ricevute_bancarie/account/account_view.xml (+3/-1)
l10n_it_ricevute_bancarie/wizard/wizard_emissione_riba.py (+2/-2)
To merge this branch: bzr merge lp:~scigghia/openobject-italia/6.1
Reviewer Review Type Date Requested Status
Lorenzo Battistini Disapprove
Review via email: mp+157623@code.launchpad.net

Description of the change

in questo proposal ho filtrato le righe di riba da emettere, quando hanno un reconcile_id

To post a comment you must log in.
Revision history for this message
Andrea Cometa (scigghia) wrote :

servirebbe anche una ulteriore modifica, sulle scadenze compensate parzialmente, importo visualizzato ed importo riportato in emissione devono corrispondere alla cifra residua e non a quella complessiva della scadenza.

lp:~scigghia/openobject-italia/6.1 updated
235. By Andrea Cometa

aggiunto importo residuo in emissione riba, modificato anche il wizard affinchè calcoli amount_residual al posto di debit

Revision history for this message
Lorenzo Battistini (elbati) wrote :

Nuova versione:
https://code.launchpad.net/~scigghia/openobject-italia/openobject-italia-6.1-imp-riba-filtri/+merge/163501

review: Disapprove

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_it_ricevute_bancarie/account/account_view.xml'
2--- l10n_it_ricevute_bancarie/account/account_view.xml 2013-03-09 11:48:05 +0000
3+++ l10n_it_ricevute_bancarie/account/account_view.xml 2013-04-08 16:34:22 +0000
4@@ -56,9 +56,11 @@
5 <field name="payment_term_id" readonly="1"/>
6 <field name="account_id" readonly="1"/>
7 <field name="debit" readonly="1" sum="Total Debit"/>
8+ <field name="amount_residual" readonly="1" sum="Total Amount" />
9 <field name="date_maturity"/>
10 <field name="riba" />
11 <field name="distinta_line_ids" invisible="1" />
12+ <field name="reconcile_id" invisible="1" />
13 </tree>
14 </field>
15 </record>
16@@ -98,7 +100,7 @@
17 <field name="view_mode">tree,form</field>
18 <field name="view_id" ref="view_riba_da_emettere_tree" />
19 <field name="context">{'search_default_da_emettere':1}</field>
20- <field name="domain">['&amp;','|',('riba','=','True'),('unsolved_invoice_ids','!=',False),('account_id.type','=','receivable')]</field>
21+ <field name="domain">['&amp;','|',('riba','=','True'),('unsolved_invoice_ids','!=',False),('account_id.type','=','receivable'), ('reconcile_id', '=', False)]</field>
22 <field name="search_view_id" ref="riba_filter"/>
23 </record>
24
25
26=== modified file 'l10n_it_ricevute_bancarie/wizard/wizard_emissione_riba.py'
27--- l10n_it_ricevute_bancarie/wizard/wizard_emissione_riba.py 2013-01-04 14:02:10 +0000
28+++ l10n_it_ricevute_bancarie/wizard/wizard_emissione_riba.py 2013-04-08 16:34:22 +0000
29@@ -99,7 +99,7 @@
30 for grouped_line in grouped_lines[key]:
31 riba_distinta_move_line.create(cr, uid, {
32 'riba_line_id': rdl_id,
33- 'amount': grouped_line.debit,
34+ 'amount': grouped_line.amount_residual,
35 'move_line_id': grouped_line.id,
36 }, context=context)
37 del grouped_lines[key]
38@@ -108,7 +108,7 @@
39 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)
40 riba_distinta_move_line.create(cr, uid, {
41 'riba_line_id': rdl_id,
42- 'amount': move_line.debit,
43+ 'amount': move_line.amount_residual,
44 'move_line_id': move_line.id,
45 }, context=context)
46

Subscribers

People subscribed via source and target branches