--- riba_file_export.py	2013-01-11 08:40:36.000000000 +0100
+++ riba_file_export-new.py	2013-01-11 11:13:12.000000000 +0100
@@ -4,7 +4,8 @@
 #    Copyright (C) 2011-2012 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
-#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>) 
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved 
 #    Thanks to Antonio de Vincentiis http://www.devincentiis.it/ ,
 #    GAzie http://gazie.sourceforge.net/
 #    and Cecchi s.r.l http://www.cecchi.com/
@@ -23,7 +24,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 '''
 *****************************************************************************************
  Questa classe genera il file RiBa standard ABI-CBI passando alla funzione "creaFile" i due array di seguito specificati:
@@ -177,15 +177,17 @@
         arrayRiba = []
         for line in order_obj.line_ids:
             debit_bank = line.bank_id
-            if not line.partner_id.address:
+            # Search the default partner address
+            debitor_address = line.move_line_ids[0].move_line_id.invoice.address_invoice_id
+            
+            if not debitor_address:
                 raise osv.except_osv('Error', _('No address specified for ') + line.partner_id.name)
-            debitor_address = line.partner_id.address
-            if debitor_address[0].street:
-               debitor_street = debitor_address[0].street
+            if debitor_address.street:
+               debitor_street = debitor_address.street
             else:
                raise osv.except_osv('Error', _('No Street specified for ') + line.partner_id.name)
-            if debitor_address[0].zip:
-               debitor_zip = debitor_address[0].zip
+            if debitor_address.zip:
+               debitor_zip = debitor_address.zip
             else:
                raise osv.except_osv('Error', _('No CAP specified for ') + line.partner_id.name)
             if not debit_bank.iban:
@@ -193,13 +195,13 @@
             debit_abi = debit_bank.iban[5:10]
             debit_cab = debit_bank.iban[10:15]
             debitor_city = ''
-            if debitor_address[0].city:
-                debitor_city = debitor_address[0].city
+            if debitor_address.city:
+                debitor_city = debitor_address.city
             else:
                 raise osv.except_osv('Error', _('No City specified for ') + line.partner_id.name) 
             debitor_province = ''
-            if debitor_address[0].province:
-                debitor_province = debitor_address[0].province.code
+            if debitor_address.province:
+                debitor_province = debitor_address.province.code
             if not line.due_date: # ??? VERIFICARE
                 due_date =  '000000'
             else: