mirror of
https://gitlab.com/flectra-hq/flectra.git
synced 2026-08-19 01:34:43 -05:00
Merge branch 'master-upstream-patch-08022024' into 'master'
[PATCH] Upstream patch - 08022024 See merge request flectra-hq/flectra!1233
This commit is contained in:
@@ -6,7 +6,7 @@ from uuid import uuid4
|
|||||||
import pytz
|
import pytz
|
||||||
|
|
||||||
from flectra import api, fields, models, tools, _
|
from flectra import api, fields, models, tools, _
|
||||||
from flectra.exceptions import ValidationError, UserError
|
from flectra.exceptions import AccessError, ValidationError, UserError
|
||||||
|
|
||||||
|
|
||||||
class AccountBankStmtCashWizard(models.Model):
|
class AccountBankStmtCashWizard(models.Model):
|
||||||
@@ -482,8 +482,13 @@ class PosConfig(models.Model):
|
|||||||
result.append((config.id, "%s (%s)" % (config.name, last_session.user_id.name)))
|
result.append((config.id, "%s (%s)" % (config.name, last_session.user_id.name)))
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
def _check_header_footer(self, values):
|
||||||
|
if not self.env.is_admin() and {'is_header_or_footer', 'receipt_header', 'receipt_footer'} & values.keys():
|
||||||
|
raise AccessError(_('Only administrators can edit receipt headers and footers'))
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def create(self, values):
|
def create(self, values):
|
||||||
|
self._check_header_footer(values)
|
||||||
IrSequence = self.env['ir.sequence'].sudo()
|
IrSequence = self.env['ir.sequence'].sudo()
|
||||||
val = {
|
val = {
|
||||||
'name': _('POS Order %s', values['name']),
|
'name': _('POS Order %s', values['name']),
|
||||||
@@ -504,6 +509,7 @@ class PosConfig(models.Model):
|
|||||||
return pos_config
|
return pos_config
|
||||||
|
|
||||||
def write(self, vals):
|
def write(self, vals):
|
||||||
|
self._check_header_footer(vals)
|
||||||
opened_session = self.mapped('session_ids').filtered(lambda s: s.state != 'closed')
|
opened_session = self.mapped('session_ids').filtered(lambda s: s.state != 'closed')
|
||||||
if opened_session:
|
if opened_session:
|
||||||
forbidden_fields = []
|
forbidden_fields = []
|
||||||
|
|||||||
@@ -443,7 +443,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-lg-6 o_setting_box">
|
<div class="col-12 col-lg-6 o_setting_box" groups="base.group_system">
|
||||||
<div class="o_setting_left_pane">
|
<div class="o_setting_left_pane">
|
||||||
<field name="is_header_or_footer"/>
|
<field name="is_header_or_footer"/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user