Browse Source

Merge pull request #6 from coopiteasy/9.0_fix_operation_conversion

9.0 fix operation conversion
pull/8/head
Houssine BAKKALI 5 years ago
committed by GitHub
parent
commit
cb17a9c51b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      easy_my_coop/models/operation_request.py
  2. 1
      easy_my_coop/view/operation_request_view.xml

9
easy_my_coop/models/operation_request.py

@ -175,6 +175,13 @@ class operation_request(models.Model):
" shares that he/she owns."))
if self.operation_type == 'convert':
amount_to_convert = self.share_unit_price * self.quantity
share_price = self.share_to_product_id.list_price
remainder = amount_to_convert % share_price
if remainder != 0:
raise ValidationError(_("The conversion must give a whole"
" number for quantity"))
if self.company_id.unmix_share_type:
if self.share_product_id.code == self.share_to_product_id.code:
raise ValidationError(_("You can't convert the share to"
@ -228,7 +235,7 @@ class operation_request(models.Model):
elif rec.operation_type == 'convert':
amount_to_convert = rec.share_unit_price * rec.quantity
convert_quant = int(amount_to_convert / rec.share_to_product_id.list_price)
remainder = amount_to_convert % rec.share_to_product_id.list_price
remainder = amount_to_convert % rec.share_to_product_id.list_price
if convert_quant > 0 and remainder == 0:
share_ids = rec.partner_id.share_ids

1
easy_my_coop/view/operation_request_view.xml

@ -32,7 +32,6 @@
<sheet>
<group>
<group>
<field name="state"/>
<field name="request_date" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="operation_type" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="receiver_not_member" attrs="{'invisible':[('operation_type','!=','transfer')]}"/>

Loading…
Cancel
Save