Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
f612e419
Commit
f612e419
authored
Dec 29, 2018
by
Hugo LEVY-FALK
Committed by
chirac
Jan 01, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add remark to custom invoices
parent
fd57a9b9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
1 deletion
+31
-1
cotisations/migrations/0036_custominvoice_remark.py
cotisations/migrations/0036_custominvoice_remark.py
+20
-0
cotisations/models.py
cotisations/models.py
+5
-0
cotisations/templates/cotisations/factures.tex
cotisations/templates/cotisations/factures.tex
+5
-1
cotisations/views.py
cotisations/views.py
+1
-0
No files found.
cotisations/migrations/0036_custominvoice_remark.py
0 → 100644
View file @
f612e419
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2018-12-29 14:22
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'cotisations'
,
'0035_notepayment'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'custominvoice'
,
name
=
'remark'
,
field
=
models
.
TextField
(
blank
=
True
,
null
=
True
,
verbose_name
=
'Remark'
),
),
]
cotisations/models.py
View file @
f612e419
...
...
@@ -286,6 +286,11 @@ class CustomInvoice(BaseInvoice):
paid
=
models
.
BooleanField
(
verbose_name
=
_
(
"Paid"
)
)
remark
=
models
.
TextField
(
verbose_name
=
_
(
"Remark"
),
blank
=
True
,
null
=
True
)
# TODO : change Vente to Purchase
...
...
cotisations/templates/cotisations/factures.tex
View file @
f612e419
...
...
@@ -111,10 +111,14 @@
\end{tabular}
\vspace
{
1cm
}
\begin{tabularx}
{
\textwidth
}{
c
X
}
\begin{tabularx}
{
\textwidth
}{
r
X
}
\hline
\textbf
{
Moyen de paiement
}
&
{{
payment
_
method|default:"Non spécifié"
}}
\\
\hline
{
% if remark %}
\textbf
{
Remarque
}
&
{{
remark|safe
}}
\\
\hline
{
% endif %}
\end{tabularx}
...
...
cotisations/views.py
View file @
f612e419
...
...
@@ -408,6 +408,7 @@ def custom_invoice_pdf(request, invoice, **_kwargs):
'phone'
:
AssoOption
.
get_cached_value
(
'telephone'
),
'tpl_path'
:
os
.
path
.
join
(
settings
.
BASE_DIR
,
LOGO_PATH
),
'payment_method'
:
invoice
.
payment
,
'remark'
:
invoice
.
remark
,
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment