Merge lp:~camptocamp/new-report-intrastat/5.0-constraint-1317063-gbr into lp:new-report-intrastat

[Guewen Baconnier @ Camptocamp]

Fixes lp:1317063

This is a backport from the 7.0 version. I just took the exact same code for the constraint.

Unmerged revisions

50. By Guewen Baconnier @ Camptocamp on 2014-05-07

constraint takes a while to execute because it executes a select on *every* supplierinfo

49. By Alexis de Lattre on 2012-03-14

Fixes bug 955065 : don't declare DEB lines with value = 0

48. By Alexis de Lattre on 2012-03-14

Now support weight computation when UoM category is "Unit" and UoM != PCE
Factorize code

47. By Alexis de Lattre on 2012-03-14

Now manage UoM other than PCE. If the UoM required by the H.S. code is not the UoM of the invoice, it will do the conversion (if possible).
Now possible to have a country of origin on the 'supplier information' instead of on the product form (usefull when the origin of a product depend on the supplier).

46. By Alexis de Lattre on 2012-03-14

Longer description for HS code.

45. By Alexis de Lattre on 2012-03-01

Modify help message.

44. By Alexis de Lattre on 2011-09-07

Comment or remove prints.

43. By Alexis de Lattre on 2011-09-07

Same modification as my previous commit for DEB : when we sell to a physical person in the EU with VAT, the move is not declared in DEB, so it must not block with a "raise" if the partner doesn't have a VAT number.

42. By Alexis de Lattre on 2011-09-05

l10n_fr_intrastat_service : Moved the raise if the Partner VAT number is missing, so that, when we sell to a physical person in the EU, we don't get the raise.
Thanks to Anevia for this interesting bug report !
We need to do the same thing in l10n_fr_intrastat_product.

41. By Alexis de Lattre on 2011-08-16

Translation and strings update.
Add demo data.

=== modified file 'intrastat_base/intrastat_demo.xml'
--- intrastat_base/intrastat_demo.xml	2013-04-24 08:55:14 +0000
+++ intrastat_base/intrastat_demo.xml	2014-05-07 12:14:44 +0000
@@ -13,7 +13,11 @@
     <field name="vat">FR58441019213</field>
 </record>
 
+<<<<<<< TREE
 <record id="base.res_partner_8" model="res.partner"> <!-- MediaPole -->
+=======
+<record id="base.res_partner_6" model="res.partner"> <!-- Elec Import -->
+>>>>>>> MERGE-SOURCE
     <field name="vat">BE0828696437</field>
     <field name="supplier">True</field>
 </record>

=== modified file 'intrastat_base/product.py'
--- intrastat_base/product.py	2014-04-14 14:32:08 +0000
+++ intrastat_base/product.py	2014-05-07 12:14:44 +0000
@@ -27,6 +27,7 @@
 class product_template(orm.Model):
     _inherit = "product.template"
     _columns = {
+<<<<<<< TREE
         'exclude_from_intrastat': fields.boolean(
             'Exclude from Intrastat reports',
             help="If set to True, the product or service will not be "
@@ -60,3 +61,14 @@
         (_check_accessory_cost, "Error msg is in raise",
             ['is_accessory_cost', 'type'])
         ]
+=======
+        'exclude_from_intrastat': fields.boolean('Exclude from Intrastat reports', help="If set to True, the product or service will not be taken into account for Intrastat Product or Service reports. So you should leave this field to False unless you have a very good reason."),
+    }
+
+    _default = {
+        'exclude_from_intrastat': lambda *a: False,
+    }
+
+product_template()
+
+>>>>>>> MERGE-SOURCE

=== modified file 'l10n_fr_intrastat_product/intrastat_product.py'
--- l10n_fr_intrastat_product/intrastat_product.py	2014-04-14 17:41:39 +0000
+++ l10n_fr_intrastat_product/intrastat_product.py	2014-05-07 12:14:44 +0000
@@ -184,6 +184,7 @@
         ('date_uniq', 'unique(start_date, company_id, type)', 'A DEB of the same type already exists for this month !'),
     ]
 
+<<<<<<< TREE
     def create_intrastat_product_lines(
             self, cr, uid, ids, intrastat, invoice, parent_values,
             context=None):
@@ -209,13 +210,60 @@
         uom_model, pce_uom_id = data_obj.get_object_reference(
             cr, uid, 'product', 'product_uom_unit')
         assert uom_model == 'product.uom', 'Wrong model uom'
+=======
+    def _get_id_from_xmlid(self, cr, uid, module, xml_id, model_name, context=None):
+        irdata_obj = self.pool.get('ir.model.data')
+        ir_data_id = irdata_obj._get_id(cr, uid, module, xml_id)
+        if ir_data_id:
+            res_id = irdata_obj.read(cr, uid, ir_data_id, ['res_id'], context=context)['res_id']
+        else:
+            raise osv.except_osv(_('Error :'), 'Hara kiri %s in _get_id_from_xmlid' % xml_id)
+        return res_id
+
+    def create_intrastat_product_lines(self, cr, uid, ids, intrastat, parent_obj, parent_values, context=None):
+        #print "create_intrastat_product_line ids=", ids
+
+        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')
+
+        weight_uom_categ_id = self._get_id_from_xmlid(cr, uid, 'product', 'product_uom_categ_kgm', 'product.uom.categ', context=context)
+
+        kg_uom_id = self._get_id_from_xmlid(cr, uid, 'product', 'product_uom_kgm', 'product.uom', context=context)
+
+        pce_uom_categ_id = self._get_id_from_xmlid(cr, uid, 'product', 'product_uom_categ_unit', 'product.uom.categ', context=context)
+
+        pce_uom_id = self._get_id_from_xmlid(cr, uid, 'product', 'product_uom_unit', 'product.uom', context=context)
+
+        if parent_obj._name == 'account.invoice':
+            src = 'invoice'
+            browse_on = parent_obj.invoice_line
+            parent_name = parent_obj.number
+            product_line_ref_field = 'invoice_id'
+        elif parent_obj._name == 'stock.picking':
+            src = 'picking'
+            browse_on = parent_obj.move_lines
+            parent_name = parent_obj.name
+            product_line_ref_field = 'picking_id'
+        else: raise osv.except_osv(_('Error :'), 'The function build_intrastat_product_lines() should have parent_obj as invoice or picking')
+>>>>>>> MERGE-SOURCE
 
         lines_to_create = []
+<<<<<<< TREE
         total_invoice_cur_accessory_cost = 0.0
         total_invoice_cur_product_value = 0.0
         for line in invoice.invoice_line:
             line_qty = line.quantity
             source_uom = line.uos_id
+=======
+        for line in browse_on:
+            if src == 'invoice':
+                line_qty = line.quantity
+                source_uom = line.uos_id
+            elif src == 'picking':
+                line_qty = line.product_qty
+                source_uom = line.product_uom
+            # We don't do anything when there is no product_id... this may be a problem...
+>>>>>>> MERGE-SOURCE
 
             # We don't do anything when there is no product_id...
             # this may be a problem... but i think a raise would be too violent
@@ -227,6 +275,7 @@
 
             if not line_qty:
                 continue
+<<<<<<< TREE
 
             # If type = "service" and is_accessory_cost=True, then we keep
             # the line (it will be skipped later on)
@@ -247,6 +296,33 @@
             amount_product_value_inv_cur_to_write = line.price_subtotal
             total_invoice_cur_product_value += line.price_subtotal
             invoice_currency_id_to_write = invoice.currency_id.id
+=======
+
+            if src == 'invoice':
+                skip_this_line = False
+                for line_tax in line.invoice_line_tax_id:
+                    if line_tax.exclude_from_intrastat_if_present:
+                        skip_this_line = True
+                if skip_this_line:
+                    continue
+                amount_invoice_currency_to_write = line.price_subtotal
+                invoice_currency_id_to_write = parent_obj.currency_id.id
+                if parent_obj.currency_id.code <> 'EUR':
+                    context['date'] = parent_obj.date_invoice
+# TODO : add invoice_currency, also in add loop, WARN picking
+                    amount_company_currency_to_write = self.pool.get('res.currency').compute(cr, uid, parent_obj.currency_id.id, intrastat.company_id.currency_id.id, line.price_subtotal, context=context)
+                else:
+                    amount_company_currency_to_write = line.price_subtotal
+            elif src == 'picking':
+                invoice_currency_id_to_write = False
+                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))
+                else:
+                    amount_company_currency_to_write = unit_stat_price * line_qty
+            #print "amount_company_currency_to_write =", amount_company_currency_to_write
+>>>>>>> MERGE-SOURCE
 
             if not parent_values['is_fiscal_only']:
 
@@ -255,6 +331,7 @@
                 else:
                     source_uom_id_to_write = source_uom.id
 
+<<<<<<< TREE
                 if source_uom.id == kg_uom_id:
                     weight_to_write = line_qty
                 elif source_uom.category_id.id == weight_uom_categ_id:
@@ -276,6 +353,29 @@
                 else:
                     raise orm.except_orm(_('Error :'), _("Conversion from unit of measure '%s' to 'Kg' is not implemented yet.") % (source_uom.name))
 
+=======
+                if source_uom.id == kg_uom_id:
+                    weight_to_write = line_qty
+                elif source_uom.category_id.id == weight_uom_categ_id:
+                    dest_uom_kg = self.pool.get('product.uom').browse(cr, uid,
+                        kg_uom_id, context=context)
+                    weight_to_write = self.pool.get('product.uom')._compute_qty_obj(cr, uid,
+                        source_uom, line_qty, dest_uom_kg, context=context)
+                elif source_uom.category_id.id == pce_uom_categ_id:
+                    if not line.product_id.weight_net:
+                        raise osv.except_osv(_('Error :'), _("Missing net weight on product '%s'.") %(line.product_id.name))
+                    if source_uom.id == pce_uom_id:
+                        weight_to_write = line.product_id.weight_net * line_qty
+                    else:
+                        dest_uom_pce = self.pool.get('product.uom').browse(cr, uid,
+                            pce_uom_id, context=context)
+                        # Here, I suppose that, on the product, the weight is per PCE and not per uom_id
+                        weight_to_write = line.product_id.weight_net * self.pool.get('product.uom')._compute_qty_obj(cr, uid, source_uom, line_qty, dest_uom_pce, context=context)
+
+                else:
+                    raise osv.except_osv(_('Error :'), _("Conversion from unit of measure '%s' to 'Kg' is not implemented yet.") %(source_uom.name))
+
+>>>>>>> MERGE-SOURCE
                 product_intrastat_code = line.product_id.intrastat_id
                 if not product_intrastat_code:
                     # If the H.S. code is not set on the product, we check if it's set
@@ -295,6 +395,7 @@
                     quantity_to_write = False
                 else:
                     intrastat_uom_id_to_write = product_intrastat_code.intrastat_uom_id.id
+<<<<<<< TREE
                     if intrastat_uom_id_to_write == source_uom_id_to_write:
                         quantity_to_write = line_qty
                     elif source_uom.category_id == product_intrastat_code.intrastat_uom_id.category_id:
@@ -303,6 +404,16 @@
                             product_intrastat_code.intrastat_uom_id, context=context)
                     else:
                         raise orm.except_orm(_('Error :'), _("On invoice '%s', the line with product '%s' has a unit of measure (%s) which can't be converted to UoM of it's intrastat code (%s).") % (invoice.number, line.product_id.name, source_uom_id_to_write, intrastat_uom_id_to_write))
+=======
+                    if intrastat_uom_id_to_write == source_uom_id_to_write:
+                        quantity_to_write = line_qty
+                    elif source_uom.category_id == product_intrastat_code.intrastat_uom_id.category_id:
+                        quantity_to_write = self.pool.get('product.uom')._compute_qty_obj(cr,
+                            uid, source_uom, line_qty,
+                            product_intrastat_code.intrastat_uom_id, context=context)
+                    else:
+                        raise osv.except_osv(_('Error :'), _("On %s '%s', the line with product '%s' has a unit of measure (%s) which can't be converted to UoM of it's intrastat code (%s).") %(src, parent_name, line.product_id.name, source_uom_id_to_write, intrastat_uom_id_to_write))
+>>>>>>> MERGE-SOURCE
 
                 # The origin country should only be declated on Import
                 if intrastat.type == 'export':
@@ -310,6 +421,7 @@
                 elif line.product_id.country_id:
                 # If we have the country of origin on the product -> take it
                     product_country_origin_id_to_write = line.product_id.country_id.id
+<<<<<<< TREE
                 else:
                     # If we don't, look on the product supplier info
                     origin_partner_id = parent_values.get('origin_partner_id', False)
@@ -332,6 +444,31 @@
                         raise orm.except_orm(_('Error :'),
                             _("Missing country of origin on product '%s' (it's not possible to get the country of origin from the 'supplier information' in this case because we don't know the supplier of this product for the invoice '%s').")
                             % (line.product_id.name, invoice.number))
+=======
+                else:
+                    # If we don't, look on the product supplier info
+                    # We only have parent_values['origin_partner_id'] when src = invoice
+                    origin_partner_id = parent_values.get('origin_partner_id', False)
+                    if origin_partner_id:
+                        supplieri_obj = self.pool.get('product.supplierinfo')
+                        supplier_ids = supplieri_obj.search(cr, uid, [
+                            ('name', '=', origin_partner_id),
+                            ('product_id', '=', line.product_id.id),
+                            ('origin_country_id', '!=', 'null')
+                            ], context=context)
+                        if not supplier_ids:
+                            raise osv.except_osv(_('Error :'),
+                                _("Missing country of origin on product '%s' or on it's supplier information for partner '%s'.")
+                                %(line.product_id.name, parent_values.get('origin_partner_name', 'none')))
+                        else:
+                            product_country_origin_id_to_write = supplieri_obj.read(cr, uid,
+                                supplier_ids[0], ['origin_country_id'],
+                                context=context)['origin_country_id'][0]
+                    else:
+                        raise osv.except_osv(_('Error :'),
+                            _("Missing country of origin on product '%s' (it's not possible to get the country of origin from the 'supplier information' in this case because we don't know the supplier of this product for the %s '%s').")
+                            %(line.product_id.name, src, parent_name))
+>>>>>>> MERGE-SOURCE
 
             else:
                 weight_to_write = False
@@ -356,7 +493,11 @@
                     line_to_create['weight'] += weight_to_write
                     line_to_create['amount_product_value_inv_cur'] += amount_product_value_inv_cur_to_write
                     break
+<<<<<<< TREE
             if create_new_line:
+=======
+            if create_new_line == True:
+>>>>>>> MERGE-SOURCE
                 lines_to_create.append({
                     'parent_id': ids[0],
                     'invoice_id': invoice.id,
@@ -378,6 +519,7 @@
                     'amount_product_value_inv_cur': amount_product_value_inv_cur_to_write,
                     'is_fiscal_only': parent_values['is_fiscal_only'],
                 })
+<<<<<<< TREE
         # End of the loop on invoice lines
 
         # Why do I manage the Partner VAT number only here and not earlier
@@ -406,8 +548,39 @@
                         parent_values['partner_vat_to_write'] = invoice.partner_id.vat
             else:
                 parent_values['partner_vat_to_write'] = False
+=======
+        # End of the loop on invoice/picking lines
+
+        # Why do I manage the Partner VAT number only here and not earlier in the code ?
+        # Because, if I sell to a physical person in the EU with VAT, then
+        # the corresponding partner will not have a VAT number, and the entry
+        # 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.")
+                # 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))
+                    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)
+                    else:
+                        parent_values['partner_vat_to_write'] = parent_obj.partner_id.vat
+            else:
+                parent_values['partner_vat_to_write'] = False
+>>>>>>> MERGE-SOURCE
 
         for line_to_create in lines_to_create:
+<<<<<<< TREE
             line_to_create['partner_vat'] = parent_values['partner_vat_to_write']
 
             if not total_invoice_cur_accessory_cost:
@@ -437,8 +610,17 @@
                 # p20 of the BOD : lines with value rounded to 0 mustn't be declared
                 continue
             for value in ['quantity', 'weight']:  # These 2 fields are char
+=======
+            line_to_create['partner_vat'] = parent_values['partner_vat_to_write']
+            line_to_create['amount_company_currency'] = int(round(line_to_create['amount_company_currency']))
+            if line_to_create['amount_company_currency'] == 0:
+                # p20 of the BOD : lines with value rounded to 0 mustn't be declared
+                continue
+            for value in ['quantity', 'weight']: # These 2 fields are char
+>>>>>>> MERGE-SOURCE
                 if line_to_create[value]:
                     line_to_create[value] = str(int(round(line_to_create[value], 0)))
+            line_to_create['amount_invoice_currency'] = int(round(line_to_create['amount_invoice_currency']))
             line_obj.create(cr, uid, line_to_create, context=context)
 
         return True
@@ -488,10 +670,25 @@
         intrastat = self.browse(cr, uid, ids[0], context=context)
         self.pool.get('report.intrastat.common')._check_generate_lines(cr, uid, intrastat, context=context)
         line_obj = self.pool.get('report.intrastat.product.line')
+<<<<<<< TREE
         line_remove_ids = line_obj.search(cr, uid, [('parent_id', '=', ids[0]), ('invoice_id', '!=', False)], context=context)
+=======
+        line_remove_ids = line_obj.search(cr, uid, [('parent_id', '=', ids[0]), (field, '!=', False)], context=context)
+        #print "line_remove_ids = ", line_remove_ids
+>>>>>>> MERGE-SOURCE
         if line_remove_ids:
             line_obj.unlink(cr, uid, line_remove_ids, context=context)
 
+<<<<<<< TREE
+=======
+
+    def generate_product_lines_from_invoice(self, cr, uid, ids, context=None):
+        #print "generate lines, ids=", ids
+        intrastat = self.browse(cr, uid, ids[0], context=context)
+        self.pool.get('report.intrastat.common')._check_generate_lines(cr, uid, intrastat, context=context)
+        self.remove_intrastat_product_lines(cr, uid, ids, 'invoice_id', context=context)
+
+>>>>>>> MERGE-SOURCE
         invoice_obj = self.pool.get('account.invoice')
         invoice_type = False
         if intrastat.type == 'import':
@@ -557,23 +754,122 @@
             else:
                 parent_values['intrastat_type_id_to_write'] = invoice.intrastat_type_id.id
 
+<<<<<<< TREE
             if invoice.intrastat_country_id and not invoice.partner_id.country_id.intrastat and invoice.partner_id.intrastat_fiscal_representative:
+=======
+            if invoice.intrastat_country_id and not invoice.address_invoice_id.country_id.intrastat and invoice.partner_id.intrastat_fiscal_representative:
+>>>>>>> MERGE-SOURCE
                 # fiscal rep
                 parent_values['partner_id_to_write'] = invoice.partner_id.intrastat_fiscal_representative.id
             else:
                 parent_values['partner_id_to_write'] = invoice.partner_id.id
 
+<<<<<<< TREE
             # Get partner on which we will check the 'country of origin' on product_supplierinfo
             parent_values['origin_partner_id'] = invoice.partner_id.id
             parent_values['origin_partner_name'] = invoice.partner_id.name
 
             parent_values = self.compute_invoice_values(cr, uid, intrastat, invoice, parent_values, context=context)
 
+=======
+            # Get partner on which we will check the 'country of origin' on product_supplierinfo
+            parent_values['origin_partner_id'] = invoice.partner_id.id
+            parent_values['origin_partner_name'] = invoice.partner_id.name
+
+            parent_values = self.common_compute_invoice_picking(cr, uid, intrastat, invoice, parent_values, context=context)
+
+>>>>>>> MERGE-SOURCE
             self.create_intrastat_product_lines(cr, uid, ids, intrastat, invoice, parent_values, context=context)
 
         return True
 
 
+<<<<<<< TREE
+=======
+
+    def generate_product_lines_from_picking(self, cr, uid, ids, context=None):
+        '''Function used to have the DEB lines corresponding to repairs'''
+        #print "generate_product_lines_from_picking ids=", ids
+        intrastat = self.browse(cr, uid, ids[0], context=context)
+        self.pool.get('report.intrastat.common')._check_generate_lines(cr, uid, intrastat, context=context)
+        # not needed when type = export and oblig_level = simplified, cf p26 du BOD
+        if intrastat.type == 'export' and intrastat.obligation_level == 'simplified':
+            raise osv.except_osv(_('Error :'), _("You don't need to get lines from picking for an export DEB in 'Simplified' obligation level."))
+
+        # Remove existing lines
+        self.remove_intrastat_product_lines(cr, uid, ids, 'picking_id', context=context)
+
+        # Check pricelist for stat value
+        if not intrastat.company_id.statistical_pricelist_id:
+            raise osv.except_osv(_('Error :'), _("You must select a 'Pricelist for statistical value' for the company %s.") %intrastat.company_id.name)
+        elif intrastat.company_id.statistical_pricelist_id.currency_id.code <> 'EUR':
+            raise osv.except_osv(_('Error :'), _("The 'Pricelist for statistical value' that you selected (%s) for the company '%s' is in %s currency and should be in EUR.") %(intrastat.company_id.statistical_pricelist_id.name, intrastat.company_id.name, intrastat.company_id.statistical_pricelist_id.currency_id.code))
+
+        pick_obj = self.pool.get('stock.picking')
+        pick_type = False
+        exclude_field = False
+        if intrastat.type == 'import':
+            pick_type = 'in'
+            exclude_field = 'purchase_id'
+        if intrastat.type == 'export':
+            pick_type = 'out'
+            exclude_field = 'sale_id'
+        # TODO : add criteria on company !!!
+        picking_ids = pick_obj.search(cr, uid, [
+            ('type', '=', pick_type),
+            ('date_done', '<=', intrastat.end_date),
+            ('date_done', '>=', intrastat.start_date),
+            ('invoice_state', '=', 'none'),
+            (exclude_field, '=', False),
+            ('state', 'not in', ('draft', 'waiting', 'confirmed', 'assigned', 'cancel'))
+        ], order='date_done', context=context)
+        #print "picking_ids =", picking_ids
+        for picking in pick_obj.browse(cr, uid, picking_ids, context=context):
+            parent_values = {}
+            #print "PICKING =", picking.name
+            if not picking.address_id:
+                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))
+            elif not picking.address_id.country_id.intrastat:
+                continue
+            else:
+                parent_values['partner_country_id_to_write'] = picking.address_id.country_id.id
+
+
+            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))
+            else:
+                parent_values['partner_id_to_write'] = picking.address_id.partner_id.id
+
+            # TODO : check = 29 /19 ???
+            if not picking.intrastat_type_id:
+                if picking.type == 'out':
+                    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))
+                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))
+                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
+
+
+            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)
+
+        return True
+
+
+
+
+>>>>>>> MERGE-SOURCE
     def done(self, cr, uid, ids, context=None):
         assert len(ids) == 1, "Only one ID accepted"
         self.write(cr, uid, ids[0], {'state': 'done'}, context=context)
@@ -587,6 +883,12 @@
 
     def generate_xml(self, cr, uid, ids, context=None):
         '''Generate the INSTAT XML file export.'''
+<<<<<<< TREE
+=======
+        #print "generate_xml ids=", ids
+        from lxml import etree
+        import deb_xsd
+>>>>>>> MERGE-SOURCE
         intrastat = self.browse(cr, uid, ids[0], context=context)
         start_date_str = intrastat.start_date
         end_date_str = intrastat.end_date
@@ -653,8 +955,13 @@
         # THEN, the fields which vary from a line to the next
         line = 0
         for pline in intrastat.intrastat_line_ids:
+<<<<<<< TREE
             line += 1  # increment line number
             #print "line =", line
+=======
+            line += 1 #increment line number
+            #print "line =", line
+>>>>>>> MERGE-SOURCE
             try: intrastat_type = self.pool.get('report.intrastat.type').read(cr, uid, pline.intrastat_type_id.id, ['is_fiscal_only'], context=context)
             except: raise orm.except_orm(_('Error :'), "Missing Intrastat type id on line %d." %line)
             item = etree.SubElement(declaration, 'Item')

=== modified file 'l10n_fr_intrastat_product/intrastat_type.py'
--- l10n_fr_intrastat_product/intrastat_type.py	2014-04-14 22:11:40 +0000
+++ l10n_fr_intrastat_product/intrastat_type.py	2014-05-07 12:14:44 +0000
@@ -57,10 +57,33 @@
 
     def _compute_all(self, cr, uid, ids, name, arg, context=None):
         result = {}
+<<<<<<< TREE
         for intr_type in self.read(
                 cr, uid, ids, ['id', 'procedure_code'], context=context):
             result[intr_type['id']] = self._compute_readonly_fields(
                 cr, uid, intr_type['procedure_code'], context=context)
+=======
+        for intr_type in self.read(cr, uid, ids, ['id', 'procedure_code'], context=context):
+            result[intr_type['id']] = {}
+            if intr_type['procedure_code'] in ('19', '29'):
+                result[intr_type['id']]['fiscal_value_multiplier'] = 0
+            elif intr_type['procedure_code'] == '25':
+                result[intr_type['id']]['fiscal_value_multiplier'] = -1
+            else:
+                result[intr_type['id']]['fiscal_value_multiplier'] = 1
+            if intr_type['procedure_code'] in fiscal_only_tuple:
+                result[intr_type['id']]['is_fiscal_only'] = True
+            else:
+                result[intr_type['id']]['is_fiscal_only'] = False
+            if intr_type['procedure_code'] in ('11', '19', '29'):
+                result[intr_type['id']]['is_vat_required'] = False
+            else:
+                result[intr_type['id']]['is_vat_required'] = True
+            if intr_type['procedure_code'] in ('11', '19'):
+                result[intr_type['id']]['intrastat_product_type'] = 'import'
+            else:
+                result[intr_type['id']]['intrastat_product_type'] = 'export'
+>>>>>>> MERGE-SOURCE
         return result
 
     _columns = {

=== modified file 'l10n_fr_intrastat_product/product.py'
--- l10n_fr_intrastat_product/product.py	2014-04-14 17:41:39 +0000
+++ l10n_fr_intrastat_product/product.py	2014-05-07 12:14:44 +0000
@@ -30,6 +30,7 @@
     _description = "Intrastat code"
     _order = "name"
     _columns = {
+<<<<<<< TREE
         'name': fields.char(
             'H.S. code', size=16, required=True,
             help="Full lenght H.S. code"),
@@ -47,6 +48,12 @@
             help="Select the unit of measure if one is required for "
             "this particular intrastat code (other than the weight in Kg). "
             "If no particular unit of measure is required, leave empty."),
+=======
+        'name': fields.char('H.S. code', size=16, required=True, help="Full lenght H.S. code"),
+        'description': fields.char('Description', size=255, help='Short text description of the H.S. category'),
+        'intrastat_code': fields.char('Intrastat code for DEB', size=9, required=True, help="H.S. code used for the DEB in France. Must be part of the 'Nomenclature combinée' (NC) with 8 digits with sometimes a 9th digit for the 'Nomenclature Générale des Produits' (NGP)."),
+        'intrastat_uom_id': fields.many2one('product.uom', 'UoM for intrastat product report', help="Select the unit of measure if one is required for this particular intrastat code (other than the weight in Kg). If no particular unit of measure is required, leave empty."),
+>>>>>>> MERGE-SOURCE
     }
 
     def name_get(self, cr, uid, ids, context=None):
@@ -103,6 +110,7 @@
 class product_template(orm.Model):
     _inherit = "product.template"
     _columns = {
+<<<<<<< TREE
         'intrastat_id': fields.many2one(
             'report.intrastat.code', 'Intrastat code',
             help="Code from the Harmonised System. Nomenclature is "
@@ -123,6 +131,19 @@
 
 
 class product_category(orm.Model):
+=======
+        'intrastat_id': fields.many2one('report.intrastat.code', 'Intrastat code', help="Code from the Harmonised System. Nomenclature is available from the World Customs Organisation, see http://www.wcoomd.org/. Some countries have made their own extensions to this nomenclature."),
+        'country_id' : fields.many2one('res.country', 'Country of origin',
+            help="Country of origin of the product i.e. product 'made in ____'. If you have different countries of origin depending on the supplier from which you purchased the product, leave this field empty and use the equivalent field on the 'product supplier info' form."),
+        # This field should be called origin_country_id, but it's named country_id to keep "compatibility with OpenERP users that used the "report_intrastat" module
+
+    }
+
+product_template()
+
+
+class product_category(osv.osv):
+>>>>>>> MERGE-SOURCE
     _inherit = "product.category"
     _columns = {
         'intrastat_id': fields.many2one(
@@ -132,6 +153,7 @@
             "related product category."),
     }
 
+<<<<<<< TREE
 
 class product_supplierinfo(orm.Model):
     _inherit = "product.supplierinfo"
@@ -176,3 +198,31 @@
         "error msg in raise",
         ['origin_country_id', 'name', 'product_id']
         )]
+=======
+product_category()
+
+
+class product_supplierinfo(osv.osv):
+    _inherit = "product.supplierinfo"
+    _columns = {
+        'origin_country_id' : fields.many2one('res.country', 'Country of origin',
+            help="Country of origin of the product (i.e. product 'made in ____') when purchased from this supplier. This field is used only when the equivalent field on the product form is empty."),
+        }
+
+    def _same_supplier_same_origin(self, cr, uid, ids):
+        """Products from the same supplier should have the same origin"""
+        for supplierinfo in self.browse(cr, uid, ids):
+            country_origin_id = supplierinfo.origin_country_id.id
+            # Search for same supplier and same product
+            same_product_same_supplier_ids = self.search(cr, uid, [('product_id', '=', supplierinfo.product_id.id), ('name', '=', supplierinfo.name.id)])
+            # 'name' on product_supplierinfo is a many2one to res.partner
+            for supplieri in self.browse(cr, uid, same_product_same_supplier_ids):
+                if country_origin_id != supplieri.origin_country_id.id:
+                    raise orm.except_orm(_('Error !'), _("For a particular product, all supplier info entries with the same supplier should have the same country of origin. But, for product '%s' with supplier '%s', there is one entry with country of origin '%s' and another entry with country of origin '%s'.") % (supplieri.product_id.name, supplieri.name.name, supplierinfo.origin_country_id.name, supplieri.origin_country_id.name))
+        return True
+
+    _constraints = [
+        (_same_supplier_same_origin, "error msg in raise", ['origin_country_id', 'name', 'product_id'])]
+
+product_supplierinfo()
+>>>>>>> MERGE-SOURCE

=== modified file 'l10n_fr_intrastat_product/product_view.xml'
--- l10n_fr_intrastat_product/product_view.xml	2014-04-14 21:42:39 +0000
+++ l10n_fr_intrastat_product/product_view.xml	2014-05-07 12:14:44 +0000
@@ -47,6 +47,19 @@
     </field>
 </record>
 
+<!-- Add field on product.supplierinfo -->
+<record id="fr_intrastat_product_supplierinfo_form" model="ir.ui.view">
+    <field name="name">fr.intrastat.product.product.supplierinfo.form</field>
+    <field name="model">product.supplierinfo</field>
+    <field name="type">form</field>
+    <field name="inherit_id" ref="product.product_supplierinfo_form_view"/>
+    <field name="arch" type="xml">
+        <field name="product_code" position="after">
+            <field name="origin_country_id" />
+        </field>
+    </field>
+</record>
+
 <!-- Add intrastat_id on Product category -->
 <record id="fr_intrastat_product_category_form" model="ir.ui.view">
     <field name="name">fr.intrastat.product.category.form</field>

=== modified file 'l10n_fr_intrastat_product/purchase.py'
--- l10n_fr_intrastat_product/purchase.py	2014-04-14 17:41:39 +0000
+++ l10n_fr_intrastat_product/purchase.py	2014-05-07 12:14:44 +0000
@@ -26,6 +26,7 @@
 class purchase_order(orm.Model):
     _inherit = "purchase.order"
 
+<<<<<<< TREE
     def action_invoice_create(self, cr, uid, ids, context=None):
         '''Copy country of partner_id =("origin country") and '''
         '''arrival department on invoice'''
@@ -42,4 +43,17 @@
                         purchase.picking_ids[0].intrastat_department
                 self.pool['account.invoice'].write(
                     cr, uid, rel_invoice.id, dico_write, context=context)
+=======
+    def action_invoice_create(self, cr, uid, ids, *args):
+        '''Copy country of partner_address_id =("origin country") and arrival department on invoice'''
+        res = super(purchase_order,self).action_invoice_create(cr, uid, ids, *args)
+        for purchase in self.browse(cr, uid, ids):
+            dico_write = {}
+            if purchase.partner_address_id and purchase.partner_address_id.country_id:
+                dico_write['intrastat_country_id'] = purchase.partner_address_id.country_id.id
+            if purchase.picking_ids:
+                dico_write['intrastat_department'] = purchase.picking_ids[0].intrastat_department
+            # invoice_id many2one -> invoice_ids many2many on v6 -> same code as sale.py
+            self.pool.get('account.invoice').write(cr, uid, purchase.invoice_id.id, dico_write)
+>>>>>>> MERGE-SOURCE
         return res

=== modified file 'l10n_fr_intrastat_product/sale.py'
--- l10n_fr_intrastat_product/sale.py	2014-04-14 17:41:39 +0000
+++ l10n_fr_intrastat_product/sale.py	2014-05-07 12:14:44 +0000
@@ -28,6 +28,7 @@
 
     def _prepare_invoice(self, cr, uid, order, lines, context=None):
         '''Copy destination country and departure department on invoice'''
+<<<<<<< TREE
         invoice_vals = super(sale_order, self)._prepare_invoice(
             cr, uid, order, lines, context=context)
         if order.partner_shipping_id and order.partner_shipping_id.country_id:
@@ -37,3 +38,18 @@
             invoice_vals['intrastat_department'] = \
                 order.picking_ids[0].intrastat_department
         return invoice_vals
+=======
+        res = super(sale_order,self).action_invoice_create(cr, uid, ids, grouped, states)
+        for sale in self.browse(cr, uid, ids):
+            for rel_invoice in sale.invoice_ids:
+                dico_write = {}
+                if sale.partner_shipping_id and sale.partner_shipping_id.country_id:
+                    dico_write['intrastat_country_id'] = sale.partner_shipping_id.country_id.id
+                if sale.picking_ids:
+                    dico_write['intrastat_department'] = sale.picking_ids[0].intrastat_department
+                self.pool.get('account.invoice').write(cr, uid, rel_invoice.id, dico_write)
+        return res
+
+sale_order()
+
+>>>>>>> MERGE-SOURCE

=== modified file 'l10n_fr_intrastat_product/stock.py'
--- l10n_fr_intrastat_product/stock.py	2014-04-14 17:41:39 +0000
+++ l10n_fr_intrastat_product/stock.py	2014-05-07 12:14:44 +0000
@@ -72,11 +72,20 @@
                         continue
                     else:
                         break
+<<<<<<< TREE
+=======
+        #print "_compute_department result=", result
+>>>>>>> MERGE-SOURCE
         return result
 
     def _get_picking_from_move_lines(self, cr, uid, ids, context=None):
+<<<<<<< TREE
         return self.pool['stock.picking'].search(
             cr, uid, [('move_lines', 'in', ids)], context=context)
+=======
+        #print "invalid function dpt ids=", ids
+        return self.pool.get('stock.picking').search(cr, uid, [('move_lines', 'in', ids)], context=context)
+>>>>>>> MERGE-SOURCE
 
     _columns = {
         'intrastat_transport': fields.selection([

=== modified file 'l10n_fr_intrastat_service/intrastat_service.py'
--- l10n_fr_intrastat_service/intrastat_service.py	2014-04-14 17:41:39 +0000
+++ l10n_fr_intrastat_service/intrastat_service.py	2014-05-07 12:14:44 +0000
@@ -164,6 +164,10 @@
         )]
 
     def generate_service_lines(self, cr, uid, ids, context=None):
+<<<<<<< TREE
+=======
+        #print "generate lines, ids=", ids
+>>>>>>> MERGE-SOURCE
         intrastat = self.browse(cr, uid, ids[0], context=context)
         line_obj = self.pool['report.intrastat.service.line']
         invoice_obj = self.pool['account.invoice']
@@ -183,6 +187,7 @@
             ('state', 'in', ('open', 'paid')),
             ('company_id', '=', intrastat.company_id.id)
         ], order='date_invoice', context=context)
+<<<<<<< TREE
         #print "invoice_ids=", invoice_ids
         for invoice in invoice_obj.browse(
                 cr, uid, invoice_ids, context=context):
@@ -202,6 +207,19 @@
             amount_invoice_cur_regular_service = 0.0
             amount_invoice_cur_accessory_cost = 0.0
             regular_product_in_invoice = False
+=======
+        #print "invoice_ids=", invoice_ids
+        for invoice in invoice_obj.browse(cr, uid, invoice_ids, context=context):
+
+            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))
+            elif not invoice.address_invoice_id.country_id.intrastat:
+                continue
+
+            amount_invoice_currency_to_write = 0.0
+            amount_company_currency_to_write = 0.0
+            context['date'] = invoice.date_invoice
+>>>>>>> MERGE-SOURCE
 
             for line in invoice.invoice_line:
                 if not line.product_id:
@@ -285,6 +303,18 @@
                 else:
                     partner_vat_to_write = invoice.partner_id.vat
 
+                # Why do I check that the Partner has a VAT number only here and not earlier ?
+                # Because, if I sell to a physical person in the EU with VAT, then
+                # the corresponding partner will not have a VAT number, and the entry
+                # will be skipped because line_tax.exclude_from_intrastat_if_present is always
+                # True and amount_company_currency_to_write = 0
+                # So we should not block with a raise before the end of the loop on the
+                # invoice lines and the "if amount_company_currency_to_write:"
+                if not invoice.partner_id.vat:
+                    raise osv.except_osv(_('Error :'), _("Missing VAT number on partner '%s'.") %invoice.partner_id.name)
+                else:
+                    partner_vat_to_write = invoice.partner_id.vat
+
                 line_obj.create(cr, uid, {
                     'parent_id': ids[0],
                     'invoice_id': invoice.id,
@@ -308,8 +338,14 @@
         return True
 
     def generate_xml(self, cr, uid, ids, context=None):
+<<<<<<< TREE
         #print "generate xml ids=", ids
         common_obj = self.pool['report.intrastat.common']
+=======
+        #print "generate xml ids=", ids
+        import des_xsd
+        from lxml import etree
+>>>>>>> MERGE-SOURCE
         intrastat = self.browse(cr, uid, ids[0], context=context)
         start_date_str = intrastat.start_date
         start_date_datetime = datetime.strptime(
@@ -344,6 +380,7 @@
             # We take amount_company_currency, to get amounts in EUR
             valeur.text = str(sline.amount_company_currency)
             partner_des = etree.SubElement(ligne_des, 'partner_des')
+<<<<<<< TREE
             try:
                 partner_des.text = sline.partner_vat.replace(' ', '')
             except:
@@ -354,6 +391,12 @@
         xml_string = etree.tostring(
             root, pretty_print=True, encoding='UTF-8', xml_declaration=True)
         #print "xml_string", xml_string
+=======
+            try: partner_des.text = sline.partner_vat.replace(' ', '')
+            except: raise osv.except_osv(_('Error :'), _("Missing VAT number on partner '%s'.") %sline.partner_id.name)
+        xml_string = etree.tostring(root, pretty_print=True, encoding='UTF-8', xml_declaration=True)
+        #print "xml_string", xml_string
+>>>>>>> MERGE-SOURCE
 
         # We now validate the XML file against the official XSD
         common_obj._check_xml_schema(