Merge 37d660b into 7e23aff

public_budget/__manifest__.py

@@ -1,7 +1,7 @@
 {
     'name': 'Public Budget',
     'license': 'AGPL-3',
-    'version': '11.0.1.21.0',
+    'version': '11.0.1.22.0',
     'author': 'ADHOC SA,Odoo Community Association (OCA)',
     'website': 'www.adhoc.com.ar',
     'category': 'Accounting & Finance',

public_budget/models/account_payment_group.py

@@ -194,12 +194,12 @@ def unlink(self):
     @api.multi
     def confirm(self):
         for rec in self:
-            if rec.expedient_id and not rec.expedient_id.\
-                    check_location_allowed_for_current_user():
-                raise UserError(_('It is not possible'
-                                  ' to confirm a payment if the payment'
-                                  ' expedient is not in a users'
-                                  ' allowed location'))
+            msg = _('It is not possible'
+                    ' to confirm a payment if the payment'
+                    ' expedient is not in a users'
+                    ' allowed location')
+            rec.expedient_id and rec.expedient_id.\
+                check_location_allowed_for_current_user(msg)
 
             if not rec.payment_base_date:
                 raise ValidationError(_(

public_budget/models/expedient.py

@@ -23,7 +23,8 @@ class PublicBudgetExpedient(models.Model):
     issue_date = fields.Datetime(
         readonly=True,
         required=True,
-        default=fields.Datetime.now
+        default=fields.Datetime.now,
+        copy=False,
     )
     cover = fields.Char(
         compute='_compute_cover',
@@ -217,14 +218,16 @@ def check_subsidy_recipient_doc(self):
 
     @api.multi
     def write(self, vals):
+        if not 'message_follower_ids' in vals:
+            self.check_location_allowed_for_current_user()
         if 'pages' in vals:
             new_pages = vals.get('pages')
             for record in self:
                 if new_pages < record.pages:
                     raise ValidationError(_('No puede disminuir la cantidad '
                                             'de páginas de un '
                                             'expediente'))
-        return super(PublicBudgetExpedient, self).write(vals)
+        return super().write(vals)
 
     @api.multi
     def check_expedients_exist(self):
@@ -314,18 +317,25 @@ def create(self, vals):
             'ir.sequence'].with_context(
                 ir_sequence_date=vals.get('issue_date')).next_by_code(
                 'public_budget.expedient') or '/'
-        return super(PublicBudgetExpedient, self).create(vals)
+        rec = super(PublicBudgetExpedient, self).create(vals)
+        rec.check_location_allowed_for_current_user()
+        return rec
 
     @api.multi
-    def check_location_allowed_for_current_user(self):
+    def check_location_allowed_for_current_user(self, msg=None):
         """This method Validate if the current user it's belongs
          to the users allowed in the current location of this expedient
         """
-        self.ensure_one()
-        if not self.current_location_id or\
-                not self.current_location_id.user_ids:
-            return True
-        if self.env.user.id not in self.current_location_id.user_ids.ids:
-            return False
-        else:
-            return True
+        for rec in self.filtered(
+                lambda x: x.current_location_id
+                and x.current_location_id.user_ids and
+                x.env.user not in x.current_location_id.user_ids):
+            raise ValidationError(msg or _(
+                'Can not complete this operation because the location the '
+                'expedient is not on your assinged locations'))
+        return True
+
+    @api.multi
+    def unlink(self):
+        self.check_location_allowed_for_current_user()
+        return super().unlink()

public_budget/models/transaction.py

@@ -363,10 +363,10 @@ def _compute_advance_amounts(self):
     @api.multi
     def mass_payment_group_create(self):
         self.ensure_one()
-        if not self.expedient_id.check_location_allowed_for_current_user():
-            raise UserError(_(
-                "It is not possible to generate a payment order if the "
-                "expedient of the transaction is not in a permitted location"))
+        msg = _(
+            "It is not possible to generate a payment order if the "
+            "expedient of the transaction is not in a permitted location")
+        self.expedient_id.check_location_allowed_for_current_user(msg)
         self = self.with_context(transaction_id=self.id)
         for invoice in self.invoice_ids.filtered(
                 lambda r: r.state == 'open'):
@@ -602,10 +602,10 @@ def action_new_payment_group(self):
         We dont use action on view because it will open on tree view
         '''
         self.ensure_one()
-        if not self.expedient_id.check_location_allowed_for_current_user():
-            raise UserError(_(
-                "It is not possible to generate a payment order if the "
-                "expedient of the transaction is not in a permitted location"))
+        msg = _(
+            "It is not possible to generate a payment order if the "
+            "expedient of the transaction is not in a permitted location")
+        self.expedient_id.check_location_allowed_for_current_user(msg)
         action = self.env['ir.model.data'].xmlid_to_object(
             'account_payment_group.action_account_payments_group_payable')
 

public_budget/security/public_budget_security.xml

@@ -5,14 +5,6 @@
         <field eval="False" name="perm_unlink"/>
     </record>
 
-    <record id="expedient_in_user_locations_rule" model="ir.rule">
-        <field name="name">Expedient only in user locations</field>
-        <field name="model_id" ref="public_budget.model_public_budget_expedient"/>
-        <field eval="True" name="global"/>
-        <field eval="False" name="perm_read"/>
-        <field name="domain_force">['|' ,('current_location_id', 'in', user.location_ids.ids), ('current_location_id', '=', False)]</field>
-    </record>
-
     <!-- portal expedient users can access all partners, we revert original portal group rule -->
     <record model="ir.rule" id="res_partner_portal_expedient_rule">
         <field name="name">res_partner: portal expedient</field>

public_budget/wizards/transaction_definitive_make_invoice.py

@@ -163,11 +163,11 @@ def _compute_lines(self):
     @api.multi
     def make_invoices(self):
         self.ensure_one()
-        if not self.transaction_id.expedient_id\
-                .check_location_allowed_for_current_user():
-            raise UserError(_('It is not possible to generate an invoice if '
-                              'the expedient of the transaction is not in a'
-                              ' permitted location of its user'))
+        msg = _('It is not possible to generate an invoice if '
+                'the expedient of the transaction is not in a'
+                ' permitted location of its user')
+        self.transaction_id.expedient_id\
+            .check_location_allowed_for_current_user(msg)
         tran_type = self.transaction_id.type_id
         advance_account = False
         if self.to_invoice_amount < 0.0:

public_budget/wizards/transaction_definitive_mass_invoice_create.py

@@ -47,11 +47,11 @@ def _get_default_company(self):
     @api.multi
     def confirm(self):
         self.ensure_one()
-        if not self.transaction_id.expedient_id\
-                .check_location_allowed_for_current_user():
-            raise UserError(_('It is not possible to generate an invoice if '
-                              'the expedient of the transaction is not in a'
-                              ' permitted location of its user'))
+        msg = _('It is not possible to generate an invoice if '
+                'the expedient of the transaction is not in a'
+                ' permitted location of its user')
+        self.transaction_id.expedient_id\
+            .check_location_allowed_for_current_user(msg)
         tran_type = self.transaction_id.type_id
         advance_account = False
         if tran_type.with_advance_payment: