Browse Source

[ADD] easy_my_coop: effective date field on operation request

pull/94/head
Manuel Claeys Bouuaert 5 years ago
parent
commit
315934c50a
  1. 5
      easy_my_coop/i18n/fr_BE.po
  2. 13
      easy_my_coop/models/operation_request.py
  3. 2
      easy_my_coop/views/operation_request_view.xml

5
easy_my_coop/i18n/fr_BE.po

@ -1666,6 +1666,11 @@ msgstr ""
msgid "Request date" msgid "Request date"
msgstr "Date de la demande" msgstr "Date de la demande"
#. module: easy_my_coop
#: model:ir.model.fields,field_description:easy_my_coop.field_operation_request__effective_date
msgid "Effective date"
msgstr "Date effective"
#. module: easy_my_coop #. module: easy_my_coop
#: model_terms:ir.ui.view,arch_db:easy_my_coop.theme_invoice_G002_document #: model_terms:ir.ui.view,arch_db:easy_my_coop.theme_invoice_G002_document
msgid "Request to Release Capital" msgid "Request to Release Capital"

13
easy_my_coop/models/operation_request.py

@ -29,6 +29,7 @@ class OperationRequest(models.Model):
request_date = fields.Date( request_date = fields.Date(
string="Request date", default=lambda self: self.get_date_now() string="Request date", default=lambda self: self.get_date_now()
) )
effective_date = fields.Date(string='Effective date')
partner_id = fields.Many2one( partner_id = fields.Many2one(
"res.partner", "res.partner",
string="Cooperator", string="Cooperator",
@ -118,6 +119,13 @@ class OperationRequest(models.Model):
invoice = fields.Many2one("account.invoice", string="Invoice") invoice = fields.Many2one("account.invoice", string="Invoice")
@api.multi
@api.constrains("effective_date")
def _constrain_effective_date(self):
for obj in self:
if obj.effective_date > fields.Datetime.now():
raise ValidationError("The effective date can not be in the future.")\
@api.multi @api.multi
def approve_operation(self): def approve_operation(self):
for rec in self: for rec in self:
@ -322,7 +330,10 @@ class OperationRequest(models.Model):
def execute_operation(self): def execute_operation(self):
self.ensure_one() self.ensure_one()
effective_date = self.get_date_now()
if self.effective_date:
effective_date = self.effective_date
else:
effective_date = self.get_date_now()
sub_request = self.env["subscription.request"] sub_request = self.env["subscription.request"]
self.validate() self.validate()

2
easy_my_coop/views/operation_request_view.xml

@ -44,6 +44,8 @@
<group> <group>
<field name="request_date" <field name="request_date"
attrs="{'readonly':[('state','!=','draft')]}"/> attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="effective_date"
attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="operation_type" <field name="operation_type"
attrs="{'readonly':[('state','!=','draft')]}"/> attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="receiver_not_member" <field name="receiver_not_member"

Loading…
Cancel
Save