Merge lp:~openerp-dev/openobject-addons/7.0-opw-595349-fka into lp:openobject-addons/7.0

[Foram Katharotiya (OpenERP)]

Hello,

I have fixed the issue of BBA structured communication.I have removed bbc error from supplier invoice.
Step to Reproduce:
- Create purchase order then confirm it.
- Click on recieve invoice.
- Set 'BBA structured communication' in communication type, save it.

Thanks,
FKA

Unmerged revisions

9349. By Foram Katharotiya (OpenERP) on 2013-08-06

[IMP] remove BBA erroe when we validate supplier invoice

=== modified file 'l10n_be_invoice_bba/account_invoice_view.xml'
--- l10n_be_invoice_bba/account_invoice_view.xml	2012-11-29 22:26:45 +0000
+++ l10n_be_invoice_bba/account_invoice_view.xml	2013-08-06 11:17:25 +0000
@@ -16,5 +16,17 @@
       </field>
     </record>
 
+    <!-- Adapt supplier Invoices to support bba structured communication -->   
+    <record id="supplier_invoice_bbacomm_form" model="ir.ui.view">
+      <field name="name">account.invoice.form.inherit</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account.invoice_supplier_form"/>
+      <field name="arch" type="xml">
+          <field name="reference_type" position="attributes">
+              <attribute name="on_change">generate_bbacomm(type,reference_type, partner_id,reference, context)</attribute>
+          </field>
+      </field>
+    </record>
+
   </data>
 </openerp>

=== modified file 'l10n_be_invoice_bba/invoice.py'
--- l10n_be_invoice_bba/invoice.py	2013-08-05 15:37:13 +0000
+++ l10n_be_invoice_bba/invoice.py	2013-08-06 11:17:25 +0000
@@ -72,7 +72,7 @@
         reference = False
         reference_type = 'none'
         if partner_id:
-            if (type == 'out_invoice'):
+            if (type in ['out_invoice','in_invoice']):
                 reference_type = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_type
                 if reference_type:
                     reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', context={})['value']['reference']
@@ -90,7 +90,7 @@
         if partner_id:
             algorithm = partner_obj.browse(cr, uid, partner_id, context=context).out_inv_comm_algorithm
         algorithm = algorithm or 'random'
-        if (type == 'out_invoice'):
+        if (type in ['out_invoice','in_invoice']):
             if reference_type == 'bba':
                 if algorithm == 'date':
                     if not self.check_bbacomm(reference):
@@ -210,7 +210,7 @@
     def copy(self, cr, uid, id, default=None, context=None):
         default = default or {}
         invoice = self.browse(cr, uid, id, context=context)
-        if invoice.type in ['out_invoice']:
+        if invoice.type in ['out_invoice' 'in_invoice']:
             reference_type = invoice.reference_type or 'none'
             default['reference_type'] = reference_type
             if reference_type == 'bba':