Browse Source

automatic fixes

pull/84/head
robin.keunen 5 years ago
parent
commit
4053d6a88a
  1. 2
      easy_my_coop/models/mail_template.py
  2. 22
      easy_my_coop/models/operation_request.py
  3. 1
      easy_my_coop/readme/CONTRIBUTORS.rst
  4. 38
      easy_my_coop/static/src/js/easy_my_coop.js
  5. 2466
      easy_my_coop/static/src/js/jquery.inputmask.bundle.js
  6. 1
      easy_my_coop_be/readme/CONTRIBUTORS.rst
  7. 1
      easy_my_coop_dividend/__init__.py
  8. 1
      easy_my_coop_dividend/models/__init__.py
  9. 1
      easy_my_coop_dividend/readme/CONTRIBUTORS.rst
  10. 1
      easy_my_coop_export_xlsx/__init__.py
  11. 1
      easy_my_coop_export_xlsx/readme/CONTRIBUTORS.rst
  12. 1
      easy_my_coop_export_xlsx/wizard/__init__.py
  13. 1
      easy_my_coop_fr/readme/CONTRIBUTORS.rst
  14. 1
      easy_my_coop_fr/views/layout_template.xml
  15. 1
      easy_my_coop_loan/readme/CONTRIBUTORS.rst
  16. 1
      easy_my_coop_loan_website/readme/CONTRIBUTORS.rst
  17. 18
      easy_my_coop_loan_website/static/src/js/loan_issue.js
  18. 1
      easy_my_coop_taxshelter_report/readme/CONTRIBUTORS.rst
  19. 1
      easy_my_coop_website/readme/CONTRIBUTORS.rst
  20. 1
      easy_my_coop_website_portal/__init__.py
  21. 1
      easy_my_coop_website_portal/controllers/__init__.py
  22. 1
      easy_my_coop_website_portal/readme/CONTRIBUTORS.rst
  23. 1
      easy_my_coop_website_taxshelter/__init__.py
  24. 1
      easy_my_coop_website_taxshelter/controllers/__init__.py
  25. 1
      easy_my_coop_website_taxshelter/readme/CONTRIBUTORS.rst
  26. 1
      partner_age/readme/CONTRIBUTORS.rst
  27. 1
      theme_light/readme/CONTRIBUTORS.rst
  28. 2
      theme_light/static/css/global_theme.sass
  29. 2
      theme_light/static/css/mail_template_B001.css
  30. 2
      theme_light/static/css/theme_zen_orange.css
  31. 1
      theme_light/static/css/theme_zen_white.css
  32. 1
      theme_light/views/layout_template.xml
  33. 1
      website_recaptcha_reloaded/readme/CONTRIBUTORS.rst

2
easy_my_coop/models/mail_template.py

@ -1,4 +1,4 @@
from odoo import models, fields
from odoo import fields, models
class MailTemplate(models.Model): class MailTemplate(models.Model):

22
easy_my_coop/models/operation_request.py

@ -376,10 +376,10 @@ class OperationRequest(models.Model):
partner = self.subscription_request.create_coop_partner() partner = self.subscription_request.create_coop_partner()
# get cooperator number # get cooperator number
sub_reg_num = int(sequence_id.next_by_id()) sub_reg_num = int(sequence_id.next_by_id())
partner_vals.update(sub_request.get_eater_vals(
partner,
self.share_product_id))
partner_vals['cooperator_register_number'] = sub_reg_num
partner_vals.update(
sub_request.get_eater_vals(partner, self.share_product_id)
)
partner_vals["cooperator_register_number"] = sub_reg_num
partner.write(partner_vals) partner.write(partner_vals)
self.partner_id_to = partner self.partner_id_to = partner
else: else:
@ -387,11 +387,15 @@ class OperationRequest(models.Model):
if not self.partner_id_to.member: if not self.partner_id_to.member:
if self.partner_id_to.cooperator_register_number == 0: if self.partner_id_to.cooperator_register_number == 0:
sub_reg_num = int(sequence_id.next_by_id()) sub_reg_num = int(sequence_id.next_by_id())
partner_vals['cooperator_register_number'] = sub_reg_num
partner_vals.update(sub_request.get_eater_vals(
self.partner_id_to,
self.share_product_id))
partner_vals['old_member'] = False
partner_vals[
"cooperator_register_number"
] = sub_reg_num
partner_vals.update(
sub_request.get_eater_vals(
self.partner_id_to, self.share_product_id
)
)
partner_vals["old_member"] = False
self.partner_id_to.write(partner_vals) self.partner_id_to.write(partner_vals)
# remove the parts to the giver # remove the parts to the giver
self.hand_share_over( self.hand_share_over(

1
easy_my_coop/readme/CONTRIBUTORS.rst

@ -1,2 +1 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs

38
easy_my_coop/static/src/js/easy_my_coop.js

@ -1,40 +1,40 @@
odoo.define('easy_my_coop.oe_easymy_coop', function (require) { odoo.define('easy_my_coop.oe_easymy_coop', function (require) {
$(document).ready(function () {
"use strict";
var ajax = require('web.ajax');
$(document).ready(function () {
"use strict";
var ajax = require('web.ajax');
$('.oe_easymy_coop').each(function () {
$('.oe_easymy_coop').each(function () {
var oe_easymy_coop = this; var oe_easymy_coop = this;
$('#share_product_id').change(function () { $('#share_product_id').change(function () {
var share_product_id = $("#share_product_id").val(); var share_product_id = $("#share_product_id").val();
ajax.jsonRpc("/subscription/get_share_product", 'call', { ajax.jsonRpc("/subscription/get_share_product", 'call', {
'share_product_id': share_product_id
'share_product_id': share_product_id,
}) })
.then(function (data) { .then(function (data) {
$('#share_price').text(data[share_product_id].list_price);
$('input.js_quantity').val(data[share_product_id].min_qty);
if(data[share_product_id].force_min_qty == true){
$('input.js_quantity').data("min",data[share_product_id].min_qty);
}
$('input.js_quantity').change();
var $share_price = $('#share_price').text()
$('input[name="total_parts"]').val($('input.js_quantity').val()*$share_price);
$('input[name="total_parts"]').change();
$('#share_price').text(data[share_product_id].list_price);
$('input.js_quantity').val(data[share_product_id].min_qty);
if (data[share_product_id].force_min_qty == true) {
$('input.js_quantity').data("min", data[share_product_id].min_qty);
}
$('input.js_quantity').change();
var $share_price = $('#share_price').text();
$('input[name="total_parts"]').val($('input.js_quantity').val()*$share_price);
$('input[name="total_parts"]').change();
}); });
}); });
$(oe_easymy_coop).on('click', 'a.js_add_cart_json', function (ev) { $(oe_easymy_coop).on('click', 'a.js_add_cart_json', function (ev) {
var $share_price = $('#share_price').text()
var $share_price = $('#share_price').text();
var $link = $(ev.currentTarget); var $link = $(ev.currentTarget);
var $input = $link.parent().parent().find("input"); var $input = $link.parent().parent().find("input");
var $input_total = $("div").find(".total"); var $input_total = $("div").find(".total");
var min = parseFloat($input.data("min") || 1); var min = parseFloat($input.data("min") || 1);
var amount_max = parseFloat($('input[name="total_parts"]').data("max")); var amount_max = parseFloat($('input[name="total_parts"]').data("max"));
var quantity = ($link.has(".fa-minus").length ? -1 : 1) + parseFloat($input.val(),10);
var quantity = ($link.has(".fa-minus").length ? -1 : 1) + parseFloat($input.val(), 10);
var total_part = quantity * $share_price; var total_part = quantity * $share_price;
var quantity_max = amount_max / $share_price; var quantity_max = amount_max / $share_price;
$input.val(quantity > min ? (total_part <= amount_max ? quantity : quantity_max) : min);
$input.val(quantity > min ? total_part <= amount_max ? quantity : quantity_max : min);
$input.change(); $input.change();
$('input[name="total_parts"]').val($input.val()*$share_price); $('input[name="total_parts"]').val($input.val()*$share_price);
return false; return false;
@ -47,6 +47,6 @@ $(document).ready(function () {
$('#share_product_id').trigger('change'); $('#share_product_id').trigger('change');
$("[name='birthdate']").inputmask(); $("[name='birthdate']").inputmask();
});
});
});
});
}); });

2466
easy_my_coop/static/src/js/jquery.inputmask.bundle.js
File diff suppressed because it is too large
View File

1
easy_my_coop_be/readme/CONTRIBUTORS.rst

@ -1,2 +1 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs

1
easy_my_coop_dividend/__init__.py

@ -1,2 +1 @@
# -*- coding: utf8 -*-
from . import models from . import models

1
easy_my_coop_dividend/models/__init__.py

@ -1,2 +1 @@
# -*- coding: utf8 -*-
from . import dividend from . import dividend

1
easy_my_coop_dividend/readme/CONTRIBUTORS.rst

@ -1,3 +1,2 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs
* Houssine BAKKALI, <houssine@coopiteasy.be> * Houssine BAKKALI, <houssine@coopiteasy.be>

1
easy_my_coop_export_xlsx/__init__.py

@ -1,2 +1 @@
# -*- coding: utf8 -*-
from . import wizard from . import wizard

1
easy_my_coop_export_xlsx/readme/CONTRIBUTORS.rst

@ -1,3 +1,2 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs
* Houssine BAKKALI, <houssine@coopiteasy.be> * Houssine BAKKALI, <houssine@coopiteasy.be>

1
easy_my_coop_export_xlsx/wizard/__init__.py

@ -1,2 +1 @@
# -*- coding: utf8 -*-
from . import export_global_wizard from . import export_global_wizard

1
easy_my_coop_fr/readme/CONTRIBUTORS.rst

@ -1,2 +1 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs

1
easy_my_coop_fr/views/layout_template.xml

@ -11,4 +11,3 @@
</template> </template>
</data> </data>
</odoo> </odoo>

1
easy_my_coop_loan/readme/CONTRIBUTORS.rst

@ -1,2 +1 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs

1
easy_my_coop_loan_website/readme/CONTRIBUTORS.rst

@ -1,2 +1 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs

18
easy_my_coop_loan_website/static/src/js/loan_issue.js

@ -1,23 +1,23 @@
odoo.define('easy_my_coop_loan_website.oe_easymy_coop_loan', function (require) { odoo.define('easy_my_coop_loan_website.oe_easymy_coop_loan', function (require) {
$(document).ready(function () {
"use strict";
var ajax = require('web.ajax');
$(document).ready(function () {
"use strict";
var ajax = require('web.ajax');
$('.oe_easymy_coop_loan').each(function () {
$('.oe_easymy_coop_loan').each(function () {
var oe_easymy_coop_loan = this; var oe_easymy_coop_loan = this;
$('#loan_issue').change(function () { $('#loan_issue').change(function () {
var loan_issue_id = $("#loan_issue").val(); var loan_issue_id = $("#loan_issue").val();
ajax.jsonRpc("/subscription/get_loan_issue", 'call', { ajax.jsonRpc("/subscription/get_loan_issue", 'call', {
'loan_issue_id': loan_issue_id
'loan_issue_id': loan_issue_id,
}) })
.then(function (data) { .then(function (data) {
if (data !== false) { if (data !== false) {
$("#subscription_amount").prop('max',data[loan_issue_id].maximum_amount_per_sub);
$("#subscription_amount").prop('step',data[loan_issue_id].face_value);
$("#subscription_amount").prop('max', data[loan_issue_id].maximum_amount_per_sub);
$("#subscription_amount").prop('step', data[loan_issue_id].face_value);
} }
}); });
}); });
$('#loan_issue').trigger('change'); $('#loan_issue').trigger('change');
});
});
});
});
}); });

1
easy_my_coop_taxshelter_report/readme/CONTRIBUTORS.rst

@ -1,2 +1 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs

1
easy_my_coop_website/readme/CONTRIBUTORS.rst

@ -1,2 +1 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs

1
easy_my_coop_website_portal/__init__.py

@ -1,2 +1 @@
# -*- coding: utf8 -*-
from . import controllers from . import controllers

1
easy_my_coop_website_portal/controllers/__init__.py

@ -1,2 +1 @@
# -*- coding: utf-8 -*-
from . import main from . import main

1
easy_my_coop_website_portal/readme/CONTRIBUTORS.rst

@ -1,2 +1 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs

1
easy_my_coop_website_taxshelter/__init__.py

@ -1,2 +1 @@
# -*- coding: utf8 -*-
from . import controllers from . import controllers

1
easy_my_coop_website_taxshelter/controllers/__init__.py

@ -1,2 +1 @@
# -*- coding: utf-8 -*-
from . import main from . import main

1
easy_my_coop_website_taxshelter/readme/CONTRIBUTORS.rst

@ -1,2 +1 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs

1
partner_age/readme/CONTRIBUTORS.rst

@ -1,2 +1 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs

1
theme_light/readme/CONTRIBUTORS.rst

@ -1,2 +1 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs

2
theme_light/static/css/global_theme.sass

@ -17,5 +17,3 @@
color: rgba(255,255,255,0.6) color: rgba(255,255,255,0.6)
+text-shadow(0 0 5px rgba(0,0,0,.5)) +text-shadow(0 0 5px rgba(0,0,0,.5))
font-size: 3em font-size: 3em

2
theme_light/static/css/mail_template_B001.css

@ -60,5 +60,3 @@ hr {
font-size: 12px; font-size: 12px;
color: #4a94a6; color: #4a94a6;
} }

2
theme_light/static/css/theme_zen_orange.css

@ -9744,5 +9744,3 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
src: url('/theme_light/static/font/Alef-Regular.ttf'); src: url('/theme_light/static/font/Alef-Regular.ttf');
src: local('Alef-Regular'), url('/theme_light/static/font/Alef-Regular.ttf') format('truetype'); src: local('Alef-Regular'), url('/theme_light/static/font/Alef-Regular.ttf') format('truetype');
} }

1
theme_light/static/css/theme_zen_white.css

@ -10738,4 +10738,3 @@ lineto-couriersans-regular
.fontsforweb_fontid_1962 { .fontsforweb_fontid_1962 {
font-family: 'Bitter-Bold' !important; font-family: 'Bitter-Bold' !important;
} }

1
theme_light/views/layout_template.xml

@ -203,4 +203,3 @@
<t t-call="theme_light.report_footer_002" /> <t t-call="theme_light.report_footer_002" />
</template> </template>
</odoo> </odoo>

1
website_recaptcha_reloaded/readme/CONTRIBUTORS.rst

@ -1,2 +1 @@
* Coop IT Easy SCRLfs * Coop IT Easy SCRLfs
Loading…
Cancel
Save