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
1447d7b1
Commit
1447d7b1
authored
Apr 11, 2018
by
Maël Kervella
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added choice for multiple articles in new PDF invoice
parent
11ed8b6a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
141 additions
and
25 deletions
+141
-25
cotisations/forms.py
cotisations/forms.py
+0
-8
cotisations/templates/cotisations/control.html
cotisations/templates/cotisations/control.html
+4
-4
cotisations/templates/cotisations/facture.html
cotisations/templates/cotisations/facture.html
+97
-0
cotisations/templates/cotisations/factures.tex
cotisations/templates/cotisations/factures.tex
+1
-1
cotisations/views.py
cotisations/views.py
+39
-12
No files found.
cotisations/forms.py
View file @
1447d7b1
...
...
@@ -145,14 +145,6 @@ class NewFactureFormPdf(Form):
"""
Form used to create a custom PDF invoice.
"""
article
=
forms
.
ModelMultipleChoiceField
(
queryset
=
Article
.
objects
.
all
(),
label
=
_l
(
"Article"
)
)
number
=
forms
.
IntegerField
(
label
=
_l
(
"Quantity"
),
validators
=
[
MinValueValidator
(
1
)]
)
paid
=
forms
.
BooleanField
(
label
=
_l
(
"Paid"
),
required
=
False
)
# TODO : change dest field to recipient
dest
=
forms
.
CharField
(
required
=
True
,
max_length
=
255
,
label
=
_l
(
"Recipient"
))
...
...
cotisations/templates/cotisations/control.html
View file @
1447d7b1
...
...
@@ -65,12 +65,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</th>
<th>
{% trans "Date" as tr_date %}
{% include 'buttons/sort.html' with prefix='control' col='date' text=tr_date %}
<
/
th
>
{% include 'buttons/sort.html' with prefix='control' col='date' text=tr_date %}
i
<
/th>
<th>
{% trans "Validated" as tr_validated %}
{% include 'buttons/sort.html' with prefix='control' col='valid' text=tr_validated %}
<
/
th
>
{% include 'buttons/sort.html' with prefix='control' col='valid' text=tr_validated %}
<
/th>
<th>
{% trans "Controlled" as tr_controlled %}
{% include 'buttons/sort.html' with prefix='control' col='control' text=tr_controlled %}
...
...
cotisations/templates/cotisations/facture.html
View file @
1447d7b1
...
...
@@ -34,8 +34,105 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<form
class=
"form"
method=
"post"
>
{% csrf_token %}
<h3>
{% trans "Invoice's articles" %}
</h3>
<div
id=
"form_set"
class=
"form-group"
>
{{ articlesformset.management_form }}
{% for articlesform in articlesformset.forms %}
<div
class=
'product_to_sell form-inline'
>
{% trans "Article" %} :
{% bootstrap_form articlesform label_class='sr-only' %}
<button
class=
"btn btn-danger btn-sm"
id=
"id_form-0-article-remove"
type=
"button"
>
<span
class=
"fa fa-times"
></span>
</button>
</div>
{% endfor %}
</div>
<input
class=
"btn btn-primary btn-sm"
role=
"button"
value=
"{% trans "
Add
an
article
"%}"
id=
"add_one"
>
<p>
{% blocktrans %}
Total price :
<span
id=
"total_price"
>
0,00
</span>
€
{% endblocktrans %}
</p>
{% bootstrap_form factureform %}
{% bootstrap_button action_name button_type='submit' icon='star' %}
</form>
<script
type=
"text/javascript"
>
var
prices
=
{};
{
%
for
article
in
articles
%
}
prices
[{{
article
.
id
|
escapejs
}}]
=
{{
article
.
prix
}};
{
%
endfor
%
}
var
template
=
`Article :
{% bootstrap_form articlesformset.empty_form label_class='sr-only' %}
<button class="btn btn-danger btn-sm"
id="id_form-__prefix__-article-remove" type="button">
<span class="fa fa-times"></span>
</button>`
function
add_article
(){
// Index start at 0 => new_index = number of items
var
new_index
=
document
.
getElementsByClassName
(
'
product_to_sell
'
).
length
;
document
.
getElementById
(
'
id_form-TOTAL_FORMS
'
).
value
++
;
var
new_article
=
document
.
createElement
(
'
div
'
);
new_article
.
className
=
'
product_to_sell form-inline
'
;
new_article
.
innerHTML
=
template
.
replace
(
/__prefix__/g
,
new_index
);
document
.
getElementById
(
'
form_set
'
).
appendChild
(
new_article
);
add_listenner_for_id
(
new_index
);
}
function
update_price
(){
var
price
=
0
;
var
product_count
=
document
.
getElementsByClassName
(
'
product_to_sell
'
).
length
;
var
article
,
article_price
,
quantity
;
for
(
i
=
0
;
i
<
product_count
;
++
i
){
article
=
document
.
getElementById
(
'
id_form-
'
+
i
.
toString
()
+
'
-article
'
).
value
;
if
(
article
==
''
)
{
continue
;
}
article_price
=
prices
[
article
];
quantity
=
document
.
getElementById
(
'
id_form-
'
+
i
.
toString
()
+
'
-quantity
'
).
value
;
price
+=
article_price
*
quantity
;
}
document
.
getElementById
(
'
total_price
'
).
innerHTML
=
price
.
toFixed
(
2
).
toString
().
replace
(
'
.
'
,
'
,
'
);
}
function
add_listenner_for_id
(
i
){
document
.
getElementById
(
'
id_form-
'
+
i
.
toString
()
+
'
-article
'
)
.
addEventListener
(
"
change
"
,
update_price
,
true
);
document
.
getElementById
(
'
id_form-
'
+
i
.
toString
()
+
'
-article
'
)
.
addEventListener
(
"
onkeypress
"
,
update_price
,
true
);
document
.
getElementById
(
'
id_form-
'
+
i
.
toString
()
+
'
-quantity
'
)
.
addEventListener
(
"
change
"
,
update_price
,
true
);
document
.
getElementById
(
'
id_form-
'
+
i
.
toString
()
+
'
-article-remove
'
)
.
addEventListener
(
"
click
"
,
function
(
event
)
{
var
article
=
event
.
target
.
parentNode
;
article
.
parentNode
.
removeChild
(
article
);
document
.
getElementById
(
'
id_form-TOTAL_FORMS
'
).
value
--
;
update_price
();
})
}
// Add events manager when DOM is fully loaded
document
.
addEventListener
(
"
DOMContentLoaded
"
,
function
()
{
document
.
getElementById
(
"
add_one
"
)
.
addEventListener
(
"
click
"
,
add_article
,
true
);
var
product_count
=
document
.
getElementsByClassName
(
'
product_to_sell
'
).
length
;
for
(
i
=
0
;
i
<
product_count
;
++
i
){
add_listenner_for_id
(
i
);
}
update_price
();
});
</script>
{% endblock %}
cotisations/templates/cotisations/factures.tex
View file @
1447d7b1
...
...
@@ -92,7 +92,7 @@
\doublehline
{
% for a in article %}
{{
a.
0.name
}}
&
{{
a.0.prix
}}
\euro
&
{{
a.1
}}
&
{{
a.2
}}
\euro\\
{{
a.
name
}}
&
{{
a.price
}}
\euro
&
{{
a.quantity
}}
&
{{
a.total
_
price
}}
\euro\\
\hline
{
% endfor %}
...
...
cotisations/views.py
View file @
1447d7b1
...
...
@@ -198,22 +198,40 @@ def new_facture_pdf(request):
get invoices that are not taken into account, for the administrative
point of view.
"""
# The template needs the list of articles (for the JS part)
articles
=
Article
.
objects
.
filter
(
Q
(
type_user
=
'All'
)
|
Q
(
type_user
=
request
.
user
.
class_name
)
)
# Building the invocie form and the article formset
invoice_form
=
NewFactureFormPdf
(
request
.
POST
or
None
)
if
invoice_form
.
is_valid
():
tbl
=
[]
article
=
invoice_form
.
cleaned_data
[
'article'
]
quantity
=
invoice_form
.
cleaned_data
[
'number'
]
if
request
.
user
.
is_class_club
:
articles_formset
=
formset_factory
(
SelectClubArticleForm
)(
request
.
POST
or
None
)
else
:
articles_formset
=
formset_factory
(
SelectUserArticleForm
)(
request
.
POST
or
None
)
if
invoice_form
.
is_valid
()
and
articles_formset
.
is_valid
():
# Get the article list and build an list out of it
# contiaining (article_name, article_price, quantity, total_price)
articles_info
=
[]
for
articles_form
in
articles_formset
:
if
articles_form
.
cleaned_data
:
article
=
articles_form
.
cleaned_data
[
'article'
]
quantity
=
articles_form
.
cleaned_data
[
'quantity'
]
articles_info
.
append
({
'name'
:
article
.
name
,
'price'
:
article
.
prix
,
'quantity'
:
quantity
,
'total_price'
:
article
.
prix
*
quantity
})
paid
=
invoice_form
.
cleaned_data
[
'paid'
]
recipient
=
invoice_form
.
cleaned_data
[
'dest'
]
address
=
invoice_form
.
cleaned_data
[
'chambre'
]
for
art
in
article
:
tbl
.
append
([
art
,
quantity
,
art
.
prix
*
quantity
])
total_price
=
sum
(
a
[
2
]
for
a
in
tbl
)
total_price
=
sum
(
a
[
'total_price'
]
for
a
in
articles_info
)
return
render_invoice
(
request
,
{
'DATE'
:
timezone
.
now
(),
'recipient_name'
:
recipient
,
'address'
:
address
,
'article'
:
tbl
,
'article'
:
articles_info
,
'total'
:
total_price
,
'paid'
:
paid
,
'asso_name'
:
AssoOption
.
get_cached_value
(
'name'
),
...
...
@@ -226,7 +244,9 @@ def new_facture_pdf(request):
})
return
form
({
'factureform'
:
invoice_form
,
'action_name'
:
_
(
"Edit"
)
'action_name'
:
_
(
"Create"
),
'articlesformset'
:
articles_formset
,
'articles'
:
articles
},
'cotisations/facture.html'
,
request
)
...
...
@@ -242,9 +262,16 @@ def facture_pdf(request, facture, factureid):
"""
# TODO : change vente to purchase
purchases_objects
=
Vente
.
objects
.
all
().
filter
(
facture
=
facture
)
purchases
=
[]
# Get the article list and build an list out of it
# contiaining (article_name, article_price, quantity, total_price)
purchases_info
=
[]
for
purchase
in
purchases_objects
:
purchases
.
append
([
purchase
,
purchase
.
number
,
purchase
.
prix_total
])
purchases_info
.
append
({
'name'
:
purchase
.
name
,
'price'
:
purchase
.
prix
,
'quantity'
:
purchase
.
number
,
'total_price'
:
purchase
.
prix_total
})
return
render_invoice
(
request
,
{
'paid'
:
True
,
'fid'
:
facture
.
id
,
...
...
@@ -254,7 +281,7 @@ def facture_pdf(request, facture, factureid):
facture
.
user
.
surname
),
'address'
:
facture
.
user
.
room
,
'article'
:
purchases
,
'article'
:
purchases
_info
,
'total'
:
facture
.
prix_total
(),
'asso_name'
:
AssoOption
.
get_cached_value
(
'name'
),
'line1'
:
AssoOption
.
get_cached_value
(
'adresse1'
),
...
...
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