openobject-italia-core-devs team mailing list archive

[Andrea Cometa <info@xxxxxxxxxxxxxxx>]

Andrea Cometa has proposed merging lp:~scigghia/openobject-italia/6.1 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/6.1/+merge/152268

ho aggiunto l'iban del cliente sulla view distinta riba,
in questo modo si ha un colpo d'occhio sui clienti che non hanno iban, onde evitare l'errore successivo nel wizard export
-- 
https://code.launchpad.net/~scigghia/openobject-italia/6.1/+merge/152268
Your team OpenERP Italia core devs is requested to review the proposed merge of lp:~scigghia/openobject-italia/6.1 into lp:openobject-italia/6.1.

=== modified file 'l10n_it_account/account/invoice.py'
--- l10n_it_account/account/invoice.py	2013-01-04 14:02:10 +0000
+++ l10n_it_account/account/invoice.py	2013-03-07 20:04:21 +0000
@@ -35,11 +35,13 @@
             inv_type = obj_inv.type
             if inv_type == 'in_invoice' or inv_type == 'in_refund':
                 return True
+            if obj_inv.internal_number:
+                return True
             number = obj_inv.number
             date_invoice = obj_inv.date_invoice
             journal = obj_inv.journal_id.id
-            res = self.search(cr, uid, [('type','=',inv_type),('date_invoice','>',date_invoice), 
-                ('number', '<', number), ('journal_id','=',journal)])
+            res = self.search(cr, uid, [('type','=',inv_type), ('number', '<', number), 
+                ('date_invoice','>',date_invoice), ('journal_id','=',journal)])
             if res:
                 raise osv.except_osv(_('Date Inconsistency'),
                         _('Cannot create invoice! Post the invoice with a greater date'))

=== modified file 'l10n_it_ricevute_bancarie/riba.py'
--- l10n_it_ricevute_bancarie/riba.py	2013-01-04 14:02:10 +0000
+++ l10n_it_ricevute_bancarie/riba.py	2013-03-07 20:04:21 +0000
@@ -320,6 +320,7 @@
         'acceptance_account_id': fields.many2one('account.account', 'Acceptance Account'),
         'amount' : fields.function(_get_line_values, method=True, string="Amount", multi="line"),
         'bank_id': fields.many2one('res.partner.bank', 'Debitor Bank'),
+        'iban': fields.related('bank_id', 'iban', type='char', string='IBAN', store=False, readonly=True),
         'distinta_id': fields.many2one('riba.distinta', 'Distinta', required=True, ondelete='cascade'),
         'partner_id' : fields.many2one('res.partner', "Cliente", readonly=True),
         'invoice_date' : fields.function(_get_line_values, string="Invoice Date", type='char', size=256, method=True, multi="line"),

=== modified file 'l10n_it_ricevute_bancarie/riba_view.xml'
--- l10n_it_ricevute_bancarie/riba_view.xml	2012-06-16 10:45:58 +0000
+++ l10n_it_ricevute_bancarie/riba_view.xml	2013-03-07 20:04:21 +0000
@@ -62,6 +62,7 @@
                                     <field name="invoice_number"/>
                                     <field name="invoice_date"/>
                                     <field name="partner_id"/>
+                                    <field name="iban"/>
                                     <field name="amount" sum="Amount"/>
                                     <field name="due_date"/>
                                     <field name="state"/>