Browse Source

[PEP8] fix pep8

pull/1/head
houssine 5 years ago
parent
commit
079d27f8d9
  1. 11
      easy_my_coop_fr/models/coop.py
  2. 24
      easy_my_coop_online_payment/models/coop.py
  3. 20
      easy_my_coop_online_payment/models/payment_transaction.py
  4. 9
      easy_my_coop_recompute_coop_number/wizard/cooperator_number_wizard.py

11
easy_my_coop_fr/models/coop.py

@ -1,9 +1,8 @@
# -*- coding: utf-8 -*-
from openerp import fields, models
class subscription_request(models.Model):
class SubscriptionRequest(models.Model):
_inherit = 'subscription.request'
company_type = fields.Selection([
@ -13,11 +12,11 @@ class subscription_request(models.Model):
('sa', 'SA / SAS')])
def get_required_field(self):
required_fields = super(subscription_request, self).get_required_field()
if 'iban' in required_fields:
required_fields.remove('iban')
req_fields = super(SubscriptionRequest, self).get_required_field()
if 'iban' in req_fields:
req_fields.remove('iban')
return required_fields
return req_fields
# override function to disable the check
def check_belgian_identification_id(self, nat_register_num):

24
easy_my_coop_online_payment/models/coop.py

@ -1,22 +1,26 @@
# -*- coding: utf-8 -*-
from openerp import api, fields, models, _
from openerp import fields, models
class SubscriptionRequest(models.Model):
_inherit = 'subscription.request'
payment_type = fields.Selection([('online', 'Online'),
('deferred', 'Deferred')], string='Payment Type', default="deferred")
def send_capital_release_request(self, invoice):
('deferred', 'Deferred')],
string='Payment Type',
default="deferred")
def send_capital_release_request(self, inv):
if self.payment_type == 'deferred':
super(SubscriptionRequest, self).send_capital_release_request(invoice)
super(SubscriptionRequest, self).send_capital_release_request(inv)
return True
class AccountInvoice(models.Model):
_inherit = 'account.invoice'
def post_process_confirm_paid(self, effective_date):
if self.subscription_request.payment_type == 'deferred':
self.set_cooperator_effective(effective_date)
return True
self.set_cooperator_effective(effective_date)
return True

20
easy_my_coop_online_payment/models/payment_transaction.py

@ -2,25 +2,27 @@
from datetime import datetime
import logging
from openerp import api, fields, models, _
from openerp import api, fields, models
_logger = logging.getLogger(__name__)
class PaymentTransaction(models.Model):
_inherit = 'payment.transaction'
release_capital_request = fields.Many2one('account.invoice', string="Release Capital request")
release_capital_request = fields.Many2one('account.invoice',
string="Release Capital request")
@api.model
def process_online_payment_reception(self,tx):
def process_online_payment_reception(self, tx):
release_capital_request = tx.release_capital_request
release_capital_request.subscription_request[0].state = 'paid'
effective_date = datetime.now().strftime("%d/%m/%Y")
release_capital_request.sudo().set_cooperator_effective(effective_date)
return True
@api.v7
def _paypal_form_validate(self, cr, uid, tx, data, context=None):
status = data.get('payment_status')
@ -42,4 +44,4 @@ class PaymentTransaction(models.Model):
error = 'Received unrecognized status for Paypal payment %s: %s, set as error' % (tx.reference, status)
_logger.info(error)
res.update(state='error', state_message=error)
return tx.write(res)
return tx.write(res)

9
easy_my_coop_recompute_coop_number/wizard/cooperator_number_wizard.py

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from openerp import models, fields, api
class RecomputeWizard(models.TransientModel):
_name = 'register.number.wizard'
@ -10,10 +11,12 @@ class RecomputeWizard(models.TransientModel):
@api.one
def compute_register_number(self):
obj_sequence = self.env['ir.sequence']
sub_reg_obj = self.env['subscription.register']
sequence_operation = obj_sequence.search([('name','=','Register Operation')])[0]
subscription_registers = self.env['subscription.register'].search([('register_number_operation', '>=', self.from_number)])
sequence_operation = obj_sequence.search([('name', '=', 'Register Operation')])[0]
subscription_registers = sub_reg_obj.search([('register_number_operation', '>=', self.from_number)])
for subscription_register in subscription_registers:
sub_reg_operation = sequence_operation.next_by_id()
subscription_register.write({'name':sub_reg_operation, 'register_number_operation': int(sub_reg_operation)})
subscription_register.write({'name': sub_reg_operation,
'register_number_operation': int(sub_reg_operation)})
Loading…
Cancel
Save