Merge lp:~therp-nl/neobis-addons/6.1-auditfile_fixes into lp:neobis-addons/6.1

[Holger Brunn (Therp)]

Thanks for the auditfile module!

This MP mainly contains fixes for coping with malformatted in the database and changes the way parters are selected, as the original way of doing it goes wrong for very big databases with a lot of partners.

[Elias (rtxehi)]

Holger,

Thanks for the updates, they look good to me, so I'll merge the changes soon.

Thanks again!

review: Approve (visual)

=== modified file 'nbs_xml_auditfile_financieel/auditfile_export.py'
--- nbs_xml_auditfile_financieel/auditfile_export.py	2013-03-25 13:47:29 +0000
+++ nbs_xml_auditfile_financieel/auditfile_export.py	2014-01-27 16:46:34 +0000
@@ -26,6 +26,7 @@
 from tools.translate import _
 from lxml import etree
 import sys
+import traceback
 import release
 import datetime
 import logging
@@ -89,11 +90,20 @@
 
         data = self.browse(cr, uid, ids[0], context=id)
 
+        # periods search
+        period_obj = self.pool.get("account.period")
+        period_ids = period_obj.search(cr, uid, ['&',
+            ('id', '>=', data.period_start.id),
+            ('id', '<=', data.period_stop.id)])
+        periods = period_obj.browse(cr, uid, period_ids)
+
         # partners search
+        cr.execute(
+            'select distinct partner_id from account_move_line where '
+                'period_id in %s and partner_id is not NULL',
+            (tuple(period_ids),))
+        partners_obj_ids = [x[0] or 0 for x in cr.fetchall()]
         partners_obj = self.pool.get("res.partner")
-        partners_obj_ids = partners_obj.search(cr, uid, ['|',
-            ('supplier', '=', 'True'),
-            ('customer', '=', 'True')])
         partners = partners_obj.browse(cr, uid, partners_obj_ids)
 
         if not partners:
@@ -116,13 +126,6 @@
             return True
         _validate_country_ids(partners)
 
-        # periods search
-        period_obj = self.pool.get("account.period")
-        period_ids = period_obj.search(cr, uid, ['&',
-            ('id', '>=', data.period_start.id),
-            ('id', '<=', data.period_stop.id)])
-        periods = period_obj.browse(cr, uid, period_ids)
-
         # journal search
         journal_obj = self.pool.get("account.journal")
         journal_ids = journal_obj.search(cr, uid, [])
@@ -253,7 +256,7 @@
             )
             self._logger.info('auditfile_export created succesfully')
         except:
-            self._logger.error(sys.exc_info())
+            self._logger.error(traceback.format_exception(*sys.exc_info()))
             raise osv.except_osv(_('Data Error'),
                 _('Invalid Data. Please, see logs for details.'))
 

=== modified file 'nbs_xml_auditfile_financieel/data/auditfile_template.xml'
--- nbs_xml_auditfile_financieel/data/auditfile_template.xml	2013-03-25 13:47:29 +0000
+++ nbs_xml_auditfile_financieel/data/auditfile_template.xml	2014-01-27 16:46:34 +0000
@@ -16,40 +16,41 @@
     <p:streetAddress>
       <p:streetname text-eval="text(company.street)"></p:streetname>
       <p:city text-eval="text(company.city)"></p:city>
-      <p:postalCode text-eval="text(company.zip)"></p:postalCode>
+      <p:postalCode text-eval="text(company.zip)[:10]"></p:postalCode>
       <p:region text-eval="text(company.state_id.name)"></p:region>
       <p:country text-eval="company.country_id.code"></p:country>
     </p:streetAddress>
     <p:postalAddress>
       <p:streetname text-eval="text(company.street)"></p:streetname>
       <p:city text-eval="text(company.city)"></p:city>
-      <p:postalCode text-eval="text(company.zip)"></p:postalCode>
+      <p:postalCode text-eval="text(company.zip)[:10]"></p:postalCode>
       <p:region text-eval="text(company.state_id.name)"></p:region>
       <p:country text-eval="company.country_id.code"></p:country>
     </p:postalAddress>
     <p:customersSuppliers>
+      <p:customerSupplier><p:custSupID text-eval="'False'"></p:custSupID></p:customerSupplier>
       <p:customerSupplier seq-eval="partners" var="partner">
         <p:custSupID text-eval="partner.id"></p:custSupID>
-        <p:custSupName text-eval="partner.name"></p:custSupName>
-        <p:contact text-eval="partner.name"></p:contact>
+        <p:custSupName text-eval="partner.name[:50]"></p:custSupName>
+        <p:contact text-eval="partner.name[:50]"></p:contact>
         <p:telephone text-eval="text(partner.phone)"></p:telephone>
         <p:fax text-eval="text(partner.phone)"></p:fax>
         <p:eMail text-eval="text(partner.email)"></p:eMail>
         <p:website text-eval="text(partner.website)"></p:website>
-        <p:taxRegistrationCountry text-eval="partner.address[0].country_id.code"></p:taxRegistrationCountry>
+        <p:taxRegistrationCountry text-eval="partner.address and partner.address[0].country_id.code"></p:taxRegistrationCountry>
         <p:taxRegIdent text-eval="text(partner.vat)"></p:taxRegIdent>
         <p:custSupTp text-eval="custSupTp(partner.supplier,partner.customer)"></p:custSupTp>
         <p:streetAddress seq-eval="partner.address" var="address">
           <p:streetname text-eval="text(address.street)"></p:streetname>
           <p:city text-eval="text(address.city)"></p:city>
-          <p:postalCode text-eval="text(address.zip)"></p:postalCode>
+          <p:postalCode text-eval="text(address.zip)[:10]"></p:postalCode>
           <p:region text-eval="text(address.state_id.name)"></p:region>
           <p:country text-eval="address.country_id.code"></p:country>
         </p:streetAddress>
         <p:postalAddress seq-eval="partner.address" var="address">
           <p:streetname text-eval="text(address.street)"></p:streetname>
           <p:city text-eval="text(address.city)"></p:city>
-          <p:postalCode text-eval="text(address.zip)"></p:postalCode>
+          <p:postalCode text-eval="text(address.zip)[:10]"></p:postalCode>
           <p:region text-eval="text(address.state_id.name)"></p:region>
           <p:country text-eval="address.country_id.code"></p:country>
         </p:postalAddress>