Merge lp:~camptocamp/new-report-intrastat/report_intrastat_product_5_group_errors into lp:new-report-intrastat/5.0

[Guewen Baconnier @ Camptocamp]

Hi Alexis,

I propose you a little improvement on your intrastat module for products.

Currently, when you generate lines from invoice or packing, on the first detected error (as example weight net is missing), it stops the generation. You have to fix your product and launch again the generation, which may stop again and so on.

So in this patch whenever we have an error, I put it in a list which is displayed in the error message at the end of the generation. That's a gain if time when you have many many errors.

I you agree with that, I hope I can do the same for the trunk version soon.

Thanks
See you

Unmerged revisions

46. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-03-13

[IMP] instead of raising an errors once they appears, concatenate a list with all errors and raise at the end, this allows to correct them without launching the report generation each time an error is fixed

=== modified file 'l10n_fr_intrastat_product/intrastat_product.py'
--- l10n_fr_intrastat_product/intrastat_product.py	2011-09-07 16:06:51 +0000
+++ l10n_fr_intrastat_product/intrastat_product.py	2012-03-13 10:43:29 +0000
@@ -133,6 +133,8 @@
         if len(ids) != 1: raise osv.except_osv(_('Error :'), 'Hara kiri in build_intrastat_product_line')
         line_obj = self.pool.get('report.intrastat.product.line')
 
+        errors = []
+
         if parent_obj._name == 'account.invoice':
             src = 'invoice'
             browse_on = parent_obj.invoice_line
@@ -199,19 +201,24 @@
                 amount_invoice_currency_to_write = False
                 unit_stat_price = self.pool.get('product.pricelist').price_get(cr, uid, [intrastat.company_id.statistical_pricelist_id.id], line.product_id.id, 1.0)[intrastat.company_id.statistical_pricelist_id.id]
                 if not unit_stat_price:
-                    raise osv.except_osv(_('Error :'), _("The Pricelist for statistical value '%s' that is set for the company '%s' gives a price of 0 for the product '%s'.") %(intrastat.company_id.statistical_pricelist_id.name, intrastat.company_id.name, line.product_id.name))
+                    errors.append(_("The Pricelist for statistical value '%s' that is set for the company '%s' gives a price of 0 for the product '%s'.") % (intrastat.company_id.statistical_pricelist_id.name, intrastat.company_id.name, line.product_id.name))
                 else:
                     amount_company_currency_to_write = unit_stat_price * line_qty
-            #print "amount_company_currency_to_write =", amount_company_currency_to_write
 
+            weight_to_write = False
+            source_uom_id_to_write = False
+            intrastat_code_id_to_write = False
+            intrastat_code_to_write = False
+            intrastat_uom_id_to_write = False
+            product_country_origin_id_to_write = False
             if not parent_values['is_fiscal_only']:
                 if not line.product_id.weight_net:
-                    raise osv.except_osv(_('Error :'), _("Missing net weight on product '%s'.") %(line.product_id.name))
+                    errors.append(_("Missing net weight on product '%s' (%s).") % (line.product_id.name, line.product_id.code))
                 else:
                     weight_to_write = line.product_id.weight_net * line_qty
 
                 if not source_uom:
-                    raise osv.except_osv(_('Error :'), _("Missing unit of measure on the line with %d product(s) '%s' on %s '%s'.") %(line_qty, line.product_id.name, src, parent_name))
+                    errors.append(_("Missing unit of measure on the line with %d product(s) '%s' on %s '%s'.") %(line_qty, line.product_id.name, src, parent_name))
                 else:
                     source_uom_id_to_write = source_uom.id
 
@@ -221,11 +228,11 @@
                     # on it's related category
                     product_intrastat_code = line.product_id.categ_id.intrastat_id
                     if not product_intrastat_code:
-                        raise osv.except_osv(_('Error :'), _("Missing H.S. code on product '%s' or on it's related category '%s'.") %(line.product_id.name, line.product_id.categ_id.complete_name))
+                        errors.append(_("Missing H.S. code on product '%s' or on it's related category '%s'.") %(line.product_id.name, line.product_id.categ_id.complete_name))
                 intrastat_code_id_to_write = product_intrastat_code.id
 
                 if not product_intrastat_code.intrastat_code:
-                    raise osv.except_osv(_('Error :'), _("Missing intrastat code on H.S. code '%s' (%s).") %(product_intrastat_code.name, product_intrastat_code.description))
+                    errors.append(_("Missing intrastat code on H.S. code '%s' (%s).") %(product_intrastat_code.name, product_intrastat_code.description))
                 else:
                     intrastat_code_to_write = product_intrastat_code.intrastat_code
 
@@ -235,24 +242,16 @@
                     intrastat_uom_id_to_write = product_intrastat_code.intrastat_uom_id.id
 
                 if intrastat_uom_id_to_write and intrastat_uom_id_to_write != source_uom_id_to_write:
-                    raise osv.except_osv(_('Error :'), _("On %s '%s', the line with %d product(s) '%s' has a unit of measure (%s) which is different from the UoM of it's intrastat code (%s). We don't handle this scenario for the moment.") %(src, parent_name, line_qty, line.product_id.name, source_uom_id_to_write, intrastat_uom_id_to_write))
+                    errors.append(_("On %s '%s', the line with %d product(s) '%s' has a unit of measure (%s) which is different from the UoM of it's intrastat code (%s). We don't handle this scenario for the moment.") %(src, parent_name, line_qty, line.product_id.name, source_uom_id_to_write, intrastat_uom_id_to_write))
 
                 # The origin country should only be declated on Import
                 if intrastat.type == 'export':
                     product_country_origin_id_to_write = False
                 elif not line.product_id.country_id:
-                    raise osv.except_osv(_('Error :'), _("Missing country of origin on product '%s'.") %(line.product_id.name))
+                    errors.append(_("Missing country of origin on product '%s'.") % line.product_id.name)
                 else:
                     product_country_origin_id_to_write = line.product_id.country_id.id
 
-            else:
-                weight_to_write = False
-                source_uom_id_to_write = False
-                intrastat_code_id_to_write = False
-                intrastat_code_to_write = False
-                intrastat_uom_id_to_write = False
-                product_country_origin_id_to_write = False
-
             create_new_line = True
             #print "lines_to_create =", lines_to_create
             for line_to_create in lines_to_create:
@@ -298,27 +297,31 @@
         # will be skipped because line_tax.exclude_from_intrastat_if_present is always True
         # So we should not block with a raise before the end of the loop on the
         # invoice/picking lines
+
         if lines_to_create:
             if parent_values['is_vat_required']:
                 if src <> 'invoice':
-                    raise osv.except_osv(_('Error :'), "We can't have such an intrastat type in a repair picking.")
+                    errors.append("We can't have such an intrastat type in a repair picking.")
                 # If I have invoice.intrastat_country_id and the invoice address
                 # is outside the EU, then I look for the fiscal rep of the partner
                 if parent_obj.intrastat_country_id and not parent_obj.address_invoice_id.country_id.intrastat:
                     if not parent_obj.partner_id.intrastat_fiscal_representative:
-                        raise osv.except_osv(_('Error :'), _("Missing fiscal representative for partner '%s'. It is required for invoice '%s' which has an invoice address outside the EU but the goods were delivered to or received from inside the EU.") % (parent_obj.partner_id.name, parent_obj.number))
+                        errors.append(_("Missing fiscal representative for partner '%s'. It is required for invoice '%s' which has an invoice address outside the EU but the goods were delivered to or received from inside the EU.") % (parent_obj.partner_id.name, parent_obj.number))
                     else:
                         parent_values['partner_vat_to_write'] = parent_obj.partner_id.intrastat_fiscal_representative.vat
                 # Otherwise, I just read the vat number on the partner of the invoice
                 else:
 
                     if not parent_obj.partner_id.vat:
-                        raise osv.except_osv(_('Error :'), _("Missing VAT number on partner '%s'.") %parent_obj.partner_id.name)
+                        errors.append(_("Missing VAT number on partner '%s'.") % parent_obj.partner_id.name)
                     else:
                         parent_values['partner_vat_to_write'] = parent_obj.partner_id.vat
             else:
                 parent_values['partner_vat_to_write'] = False
 
+        if errors:
+            return False, errors
+
         for line_to_create in lines_to_create:
             line_to_create['partner_vat'] = parent_values['partner_vat_to_write']
             for value in ['quantity', 'weight', 'amount_company_currency', 'amount_invoice_currency']:
@@ -326,7 +329,7 @@
                     line_to_create[value] = str(int(round(line_to_create[value], 0)))
             line_obj.create(cr, uid, line_to_create, context=context)
 
-        return True
+        return True, []
 
 
     def common_compute_invoice_picking(self, cr, uid, intrastat, parent_obj, parent_values, context=None):
@@ -349,6 +352,10 @@
             parent_name = parent_obj.name
         else: raise osv.except_osv(_('Error :'), 'The function build_intrastat_product_lines() should have parent_obj as invoice or picking')
 
+        parent_values['department_to_write'] = False
+        parent_values['transport_to_write'] = False
+        parent_values['transaction_code_to_write'] = False
+        parent_values['partner_country_id_to_write'] = False
         if not parent_values['is_fiscal_only']:
             if not parent_obj.intrastat_transport:
                 try: parent_values['transport_to_write'] = intrastat.company_id.default_intrastat_transport
@@ -361,11 +368,6 @@
                 except: raise osv.except_osv(_('Error :'), _("The intrastat department hasn't been set on %s '%s' and the default intrastat department is missing on the company '%s'.") %(src, parent_name, intrastat.company_id.name))
             else:
                 parent_values['department_to_write'] = parent_obj.intrastat_department
-        else:
-            parent_values['department_to_write'] = False
-            parent_values['transport_to_write'] = False
-            parent_values['transaction_code_to_write'] = False
-            parent_values['partner_country_id_to_write'] = False
 
         return parent_values
 
@@ -402,13 +404,14 @@
             ('company_id', '=', intrastat.company_id.id)
         ], order='date_invoice', context=context)
         #print "invoice_ids=", invoice_ids
+        errors = []
         for invoice in invoice_obj.browse(cr, uid, invoice_ids, context=context):
             #print "INVOICE num =", invoice.number
             parent_values = {}
 
             # We should always have a country on address_invoice_id
             if not invoice.address_invoice_id.country_id:
-                raise osv.except_osv(_('Error :'), _("Missing country on partner address '%s' of partner '%s'.") %(invoice.address_invoice_id.name, invoice.address_invoice_id.partner_id.name))
+                errors.append(_("Missing country on partner address '%s' of partner '%s'.") % (invoice.address_invoice_id.name, invoice.address_invoice_id.partner_id.name))
 
             # If I have no invoice.intrastat_country_id, which is the case the first month
             # of the deployment of the module, then I use the country on invoice address
@@ -430,17 +433,17 @@
                     if intrastat.company_id.default_intrastat_type_out_invoice:
                         parent_values['intrastat_type_id_to_write'] = intrastat.company_id.default_intrastat_type_out_invoice.id
                     else:
-                        raise osv.except_osv(_('Error :'), _("The intrastat type hasn't been set on invoice '%s' and the 'default intrastat type for customer invoice' is missing for the company '%s'.") %(invoice.number, intrastat.company_id.name))
+                        errors.append(_("The intrastat type hasn't been set on invoice '%s' and the 'default intrastat type for customer invoice' is missing for the company '%s'.") %(invoice.number, intrastat.company_id.name))
                 elif invoice.type == 'out_refund':
                     if intrastat.company_id.default_intrastat_type_out_refund:
                         parent_values['intrastat_type_id_to_write'] = intrastat.company_id.default_intrastat_type_out_refund.id
                     else:
-                        raise osv.except_osv(_('Error :'), _("The intrastat type hasn't been set on refund '%s' and the 'default intrastat type for customer refund' is missing for the company '%s'.") %(invoice.number, intrastat.company_id.name))
+                        errors.append(_("The intrastat type hasn't been set on refund '%s' and the 'default intrastat type for customer refund' is missing for the company '%s'.") %(invoice.number, intrastat.company_id.name))
                 elif invoice.type == 'in_invoice':
                     if intrastat.company_id.default_intrastat_type_in_invoice:
                         parent_values['intrastat_type_id_to_write'] = intrastat.company_id.default_intrastat_type_in_invoice.id
                     else:
-                        raise osv.except_osv(_('Error :'), _("The intrastat type hasn't been set on invoice '%s' and the 'Default intrastat type for supplier invoice' is missing for the company '%s'.") %(invoice.number, intrastat.company_id.name))
+                        errors.append(_("The intrastat type hasn't been set on invoice '%s' and the 'Default intrastat type for supplier invoice' is missing for the company '%s'.") %(invoice.number, intrastat.company_id.name))
                 else: raise osv.except_osv(_('Error :'), "Hara kiri... we can't have a supplier refund")
 
             else:
@@ -454,7 +457,12 @@
 
             parent_values = self.common_compute_invoice_picking(cr, uid, intrastat, invoice, parent_values, context=context)
 
-            self.create_intrastat_product_lines(cr, uid, ids, intrastat, invoice, parent_values, context=context)
+            __, product_errors = self.create_intrastat_product_lines(cr, uid, ids, intrastat, invoice, parent_values, context=context)
+            if product_errors:
+                errors += product_errors
+
+        if errors:
+            raise osv.except_osv(_('Errors'), '\n'.join(errors))
 
         return True
 
@@ -496,7 +504,8 @@
             (exclude_field, '=', False),
             ('state', 'not in', ('draft', 'waiting', 'confirmed', 'assigned', 'cancel'))
         ], order='date_done', context=context)
-        #print "picking_ids =", picking_ids
+
+        errors = []
         for picking in pick_obj.browse(cr, uid, picking_ids, context=context):
             parent_values = {}
             #print "PICKING =", picking.name
@@ -504,7 +513,7 @@
                 continue
 
             if not picking.address_id.country_id:
-                raise osv.except_osv(_('Error :'), _("Missing country on partner address '%s' used on picking '%s'.") %(picking.address_id.name, picking.name))
+                errors.append(_("Missing country on partner address '%s' used on picking '%s'.") % (picking.address_id.name, picking.name))
             elif not picking.address_id.country_id.intrastat:
                 continue
             else:
@@ -512,7 +521,7 @@
 
 
             if not picking.address_id.partner_id:
-                raise osv.except_osv(_('Error :'), _("Partner address '%s' used on picking '%s' is not linked to a partner !") %(move_line.address_id.name, picking.name))
+                errors.append(_("Partner address '%s' used on picking '%s' is not linked to a partner !") % (picking.address_id.name, picking.name))
             else:
                 parent_values['partner_id_to_write'] = picking.address_id.partner_id.id
 
@@ -522,12 +531,12 @@
                     if intrastat.company_id.default_intrastat_type_out_picking:
                         parent_values['intrastat_type_id_to_write'] = intrastat.company_id.default_intrastat_type_out_picking.id
                     else:
-                        raise osv.except_osv(_('Error :'), _("The intrastat type hasn't been set on picking '%s' and the 'default intrastat type for outgoing products' is missing for the company '%s'.") %(picking.name, intrastat.company_id.name))
+                        errors.append(_("The intrastat type hasn't been set on picking '%s' and the 'default intrastat type for outgoing products' is missing for the company '%s'.") % (picking.name, intrastat.company_id.name))
                 elif picking.type == 'in':
                     if intrastat.company_id.default_intrastat_type_in_picking:
                         parent_values['intrastat_type_id_to_write'] = intrastat.company_id.default_intrastat_type_in_picking.id
                     else:
-                        raise osv.except_osv(_('Error :'), _("The intrastat type hasn't been set on picking '%s' and the 'default intrastat type for incoming products' is missing for the company '%s'.") %(picking.name, intrastat.company_id.name))
+                        errors.append(_("The intrastat type hasn't been set on picking '%s' and the 'default intrastat type for incoming products' is missing for the company '%s'.") % (picking.name, intrastat.company_id.name))
                 else: raise osv.except_osv(_('Error :'), "Hara kiri... we can't arrive here")
             else:
                 parent_values['intrastat_type_id_to_write'] = picking.intrastat_type_id.id
@@ -535,7 +544,12 @@
 
             parent_values = self.common_compute_invoice_picking(cr, uid, intrastat, picking, parent_values, context=context)
 
-            self.create_intrastat_product_lines(cr, uid, ids, intrastat, picking, parent_values, context=context)
+            __, product_errors = self.create_intrastat_product_lines(cr, uid, ids, intrastat, picking, parent_values, context=context)
+            if product_errors:
+                errors += product_errors
+
+        if errors:
+            raise osv.except_osv(_('Errors'), '\n'.join(errors))
 
         return True