diff --git a/views/res_config_settings.xml b/views/res_config_settings.xml index a40d549c66b84233f2bf7daa9139ea624b05118a..070d34d87917dfa407afc6283a47487b967a586c 100644 --- a/views/res_config_settings.xml +++ b/views/res_config_settings.xml @@ -171,6 +171,9 @@ attrs="{'required': [('is_contribution_cg', '=', True)]}" /> </div> + <hr + attrs="{'invisible': [('is_contribution_cg', '=', False)]}" + /> <!-- Cotisation UR IDF --> <div class="o_setting_right_pane" diff --git a/wizard/scop_bordereau_refund_wizard.py b/wizard/scop_bordereau_refund_wizard.py index a1bb5dc18b1ec326f93a69f95f649a1bc127b1cf..1fc5221f9a41615b2eba86f83b50ade1e2a29728 100644 --- a/wizard/scop_bordereau_refund_wizard.py +++ b/wizard/scop_bordereau_refund_wizard.py @@ -79,9 +79,13 @@ class ScopBordereauRefundWizard(models.TransientModel): ) ur_hdf = self.env.ref("cgscop_partner.riga_14232").id + ur_idf = self.env.ref("cgscop_partner.riga_14231").id + ur_med = self.env.ref("cgscop_partner.riga_14243").id if bordereau_id.partner_id.ur_id.id == ur_hdf: product_ur = self.env.company.contribution_hdf_id - else: # ur = ur_med + elif bordereau_id.partner_id.ur_id.id == ur_idf: + product_ur = self.env.company.contribution_idf_id + elif bordereau_id.partner_id.ur_id.id == ur_med: product_ur = self.env.company.contribution_med_id cotiz_type = { @@ -126,6 +130,7 @@ class ScopBordereauRefundWizard(models.TransientModel): partner_id = bordereau_id.partner_id ur_hdf = self.env.ref("cgscop_partner.riga_14232").id ur_idf = self.env.ref("cgscop_partner.riga_14231").id + ur_med = self.env.ref("cgscop_partner.riga_14243").id # CREATE VERSION bordereau_id.read(["amount_total_cotiz"]) @@ -153,7 +158,7 @@ class ScopBordereauRefundWizard(models.TransientModel): elif partner_id.ur_id.id == ur_idf: product_ur = self.env.company.contribution_idf_id journal_ur = self.env.user.company_id.journal_ur_idf_id - else: # ur = ur_med + elif partner_id.ur_id.id == ur_med: product_ur = self.env.company.contribution_med_id journal_ur = self.env.user.company_id.journal_ur_med_id