Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
Djangoldp Invoice
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Startin blox
djangoldp-packages
Djangoldp Invoice
Commits
15a8ad69
Commit
15a8ad69
authored
Mar 27, 2019
by
Jean-Baptiste
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug/htAmount' into 'master'
HtAmount return statement See merge request
!1
parents
a43478d6
a130065d
Pipeline
#2898
passed with stage
in 27 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
djangoldp_invoice/models.py
djangoldp_invoice/models.py
+4
-2
No files found.
djangoldp_invoice/models.py
View file @
15a8ad69
...
...
@@ -60,9 +60,11 @@ class CustomerInvoice(Model):
invoicingDate
=
models
.
DateField
(
default
=
datetime
.
date
.
today
)
def
htAmount
(
self
):
htAmount
=
Decimal
(
0
)
if
self
.
batches
is
None
:
return
self
.
batches
.
aggregate
(
total
=
Sum
(
'tasks__htAmount'
))[
'total'
]
return
0
htAmount
=
self
.
batches
.
aggregate
(
total
=
Sum
(
'tasks__htAmount'
))[
'total'
]
return
htAmount
def
tvaAmount
(
self
):
return
Decimal
(
self
.
tvaRate
*
self
.
htAmount
()
/
Decimal
(
100
))
...
...
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