Merge lp:~openerp-dev/openobject-addons/7.0-opw-596067-pna into lp:openobject-addons/7.0

[Pinakin Nayi (OpenERP)]

Hello Sir,

I improved 10n_be_invoice_bba change compare algorithm so its compare on invoice type.

For more detail :
https://bugs.launchpad.net/openobject-addons/+bug/1206852

Thanks,
pna

Unmerged revisions

9345. By Pinakin Nayi (OpenERP) on 2013-08-05

[FIX]l10n_be_invoice_bba : change compare algorithm so its compare on invoice type

=== modified file 'l10n_be_invoice_bba/invoice.py'
--- l10n_be_invoice_bba/invoice.py	2013-06-12 15:26:10 +0000
+++ l10n_be_invoice_bba/invoice.py	2013-08-05 12:23:26 +0000
@@ -173,9 +173,13 @@
             if self.check_bbacomm(reference):
                 reference = re.sub('\D', '', reference)
                 vals['reference'] = '+++' + reference[0:3] + '/' + reference[3:7] + '/' + reference[7:] + '+++'
-                same_ids = self.search(cr, uid,
-                    [('type', '=', 'out_invoice'), ('reference_type', '=', 'bba'),
-                     ('reference', '=', vals['reference'])])
+                if context.get('type') == 'out_invoice' :
+                    domain = [('reference_type', '=', 'bba'),
+                     ('reference', '=', vals['reference']),('type', '=', 'out_invoice')]
+                else :
+                    domain = [('reference_type', '=', 'bba'),
+                     ('reference', '=', vals['reference']),('type', '=', 'in_invoice'), ('partner_id','=',vals['partner_id'])]
+                same_ids = self.search(cr, uid, domain)
                 if same_ids:
                     raise osv.except_osv(_('Warning!'),
                         _('The BBA Structured Communication has already been used!' \
@@ -198,9 +202,13 @@
                 if self.check_bbacomm(bbacomm):
                     reference = re.sub('\D', '', bbacomm)
                     vals['reference'] = '+++' + reference[0:3] + '/' + reference[3:7] + '/' + reference[7:] + '+++'
-                    same_ids = self.search(cr, uid,
-                        [('id', '!=', inv.id), ('type', '=', 'out_invoice'),
-                         ('reference_type', '=', 'bba'), ('reference', '=', vals['reference'])])
+                    if inv.type == 'out_invoice' :
+                        domain = [('id', '!=', inv.id), ('type', '=', 'out_invoice'),
+                                  ('reference_type', '=', 'bba'), ('reference', '=', vals['reference'])]
+                    else :
+                        domain = [('id', '!=', inv.id), ('type', '=', 'in_invoice'),
+                                  ('reference_type', '=', 'bba'), ('reference', '=', vals['reference']), ('partner_id', '=', inv.partner_id.id)]
+                    same_ids = self.search(cr, uid, domain)
                     if same_ids:
                         raise osv.except_osv(_('Warning!'),
                             _('The BBA Structured Communication has already been used!' \