Browse Source

Merge pull request #23 from coopiteasy/12.0-remove-no-registre

[FIX] emc: replace no_registre by national_register_number
pull/24/head
Houssine BAKKALI 5 years ago
committed by GitHub
parent
commit
452d45e4c8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      easy_my_coop/models/partner.py
  2. 2
      easy_my_coop_export_xlsx/wizard/export_global_wizard.py
  3. 8
      easy_my_coop_website/controllers/main.py

1
easy_my_coop/models/partner.py

@ -109,7 +109,6 @@ class ResPartner(models.Model):
('female', 'Female'),
('other', 'Other')],
string='Gender')
national_register_number = fields.Char(string='National Register Number')
share_ids = fields.One2many('share.line',
'partner_id',
string='Share Lines')

2
easy_my_coop_export_xlsx/wizard/export_global_wizard.py

@ -244,8 +244,6 @@ class export_global_report(models.TransientModel):
i += 1
worksheet2.write(j, i, sub_request.state)
i += 1
worksheet2.write(j, i, sub_request.no_registre)
i += 1
worksheet2.write(j, i, sub_request.email)
i += 1
worksheet2.write(j, i, sub_request.phone)

8
easy_my_coop_website/controllers/main.py

@ -13,16 +13,16 @@ _BLACKLIST = ['id', 'create_uid', 'create_date', 'write_uid', 'write_date',
'user_id', 'active']
_COOP_FORM_FIELD = ['email', 'confirm_email', 'firstname', 'lastname',
'birthdate', 'iban', 'share_product_id', 'no_registre',
'birthdate', 'iban', 'share_product_id',
'address', 'city', 'zip_code', 'country_id', 'phone',
'lang', 'nb_parts', 'total_parts', 'error_msg']
_COMPANY_FORM_FIELD = ['is_company', 'company_register_number', 'company_name',
'company_email', 'confirm_email', 'email', 'firstname',
'lastname', 'birthdate', 'iban', 'share_product_id',
'no_registre', 'address', 'city', 'zip_code',
'country_id', 'phone', 'lang', 'nb_parts',
'total_parts', 'error_msg', 'company_type']
'address', 'city', 'zip_code', 'country_id', 'phone',
'lang', 'nb_parts', 'total_parts', 'error_msg',
'company_type']
class WebsiteSubscription(http.Controller):

Loading…
Cancel
Save