[FIX] fix ported from v9

easy_my_coop/controllers/main.py

@@ -248,7 +248,7 @@ class WebsiteSubscription(http.Controller):
                                     "is not valid")
             return request.website.render(redirect, values)
 
-        if not is_company:
+        if not is_company and 'no_registre' in required_fields:
             no_registre = re.sub('[^0-9a-zA-Z]+', '',
                                  kwargs.get("no_registre"))
             valid = sub_req_obj.check_belgian_identification_id(no_registre)
@@ -304,6 +304,8 @@ class WebsiteSubscription(http.Controller):
     def share_subscription(self, **kwargs):
         sub_req_obj = request.env['subscription.request']
         attach_obj = request.env['ir.attachment']
+        required_fields = sub_req_obj.sudo().get_required_field()
+
         # List of file to add to ir_attachment once we have the ID
         post_file = []
         # Info to add after the message
@@ -360,6 +362,10 @@ class WebsiteSubscription(http.Controller):
             no_registre = re.sub('[^0-9a-zA-Z]+', '',
                                  kwargs.get("no_registre"))
             values["no_registre"] = no_registre
+            if 'no_registre' in required_fields:
+                no_registre = re.sub('[^0-9a-zA-Z]+', '',
+                                     kwargs.get("no_registre"))
+                values["no_registre"] = no_registre
 
             subscription_id = sub_req_obj.sudo().create(values)
 

easy_my_coop/models/coop.py

@@ -253,8 +253,11 @@ class subscription_request(models.Model):
                        required=True,
                        readonly=True,
                        states={'draft': [('readonly', False)]},
-                       default=lambda self: datetime.strftime(datetime.now(), '%Y-%m-%d'))
-    company_id = fields.Many2one('res.company', string='Company', required=True,
+                       default=lambda self: datetime.strftime(datetime.now(),
+                                                              '%Y-%m-%d'))
+    company_id = fields.Many2one('res.company',
+                                 string='Company',
+                                 required=True,
                                  change_default=True,
                                  readonly=True,
                                  default=lambda self: self.env['res.company']._company_default_get())
@@ -485,6 +488,7 @@ class subscription_request(models.Model):
             partner = self.partner_id
         else:
             partner = None
+            domain = []
             if self.already_cooperator:
                 raise UserError(_('The checkbox already cooperator is'
                                   ' checked please select a cooperator.'))
@@ -493,6 +497,7 @@ class subscription_request(models.Model):
             elif not self.is_company and self.no_registre:
                 domain = [('national_register_number', '=', self.no_registre)]
 
+            if domain:
                 partner = partner_obj.search(domain)
 
         if not partner:

easy_my_coop/view/account_invoice_view.xml

@@ -1,5 +1,4 @@
 <openerp>
-	<data>
 	<record id="invoice_form" model="ir.ui.view">
            <field name="name">account.invoice.form</field>
            <field name="model">account.invoice</field>
@@ -84,5 +83,4 @@
            <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
            <field name="search_view_id" ref="account.view_account_invoice_filter"/>
        </record>
-	</data>
 </openerp>

easy_my_coop_ch/models/coop.py

@@ -24,3 +24,8 @@ class subscription_request(models.Model):
     def check_belgian_identification_id(self, nat_register_num):
         # deactivate number validation for swiss localization
         return True
+
+    def check_iban(self, iban):
+        if iban:
+            return super(subscription_request, self).check_iban(iban)
+        return True