Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scheduling-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SMASCH
scheduling-system
Commits
c55d1b8e
Commit
c55d1b8e
authored
3 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/master' into fix/435
parents
c6dab981
045a41a6
No related branches found
No related tags found
1 merge request
!333
consider the case that an appoinment is not set to a particular visit. the...
Pipeline
#45581
passed
3 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG
+4
-1
4 additions, 1 deletion
CHANGELOG
smash/web/views/mails.py
+4
-0
4 additions, 0 deletions
smash/web/views/mails.py
with
8 additions
and
1 deletion
CHANGELOG
+
4
−
1
View file @
c55d1b8e
smasch (1.1.0~alpha.0-1) unstable; urgency=low
* improvement: warn the user on invalid date range when creating a holidays/extra availability (#427)
* improvement: warn the user on invalid date range when creating a
holidays/extra availability (#427)
* improvement: user can modify/add Subject types with custom follow up schema
(#371)
* improvement: added week day to daily planning main date (#425)
* improvement: possibility to import custom fields data from csv file (#385)
* improvement: added warning in case of printing voucher with no voucher
templates (#451)
* bug fix: privacy notice files were not removed when policy was removed
* bug fix: holidays were wrongly encoded and displayed when they span
multiple days (#430, #429)
...
...
This diff is collapsed.
Click to expand it.
smash/web/views/mails.py
+
4
−
0
View file @
c55d1b8e
...
...
@@ -121,6 +121,10 @@ def generate_for_vouchers(request):
vouchers
.
append
(
Voucher
.
objects
.
get
(
pk
=
int
(
voucher_id
)))
templates
=
MailTemplate
.
get_voucher_mail_templates
([])[
0
]
if
len
(
templates
)
==
0
:
messages
.
add_message
(
request
,
messages
.
WARNING
,
'
There are no voucher mail templates. Please add one in order to print vouchers.
'
)
return
redirect
(
request
.
META
.
get
(
'
HTTP_REFERER
'
,
'
web.views.subjects
'
))
output_stream
=
io
.
BytesIO
()
inputs
=
[]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment