Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
third-party
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cooperatic-foodcoops
third-party
Commits
65a641f0
Commit
65a641f0
authored
Feb 09, 2023
by
François C.
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ticket_4292' into 'dev_cooperatic'
Add MonA paiement to pos export See merge request
!219
parents
5cdce3aa
378308c6
Pipeline
#2596
failed with stage
in 1 minute 23 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
views.py
outils/views.py
+10
-5
No files found.
outils/views.py
View file @
65a641f0
...
@@ -195,9 +195,10 @@ class ExportPOS(View):
...
@@ -195,9 +195,10 @@ class ExportPOS(View):
'CHQ'
:
0
,
'CHQ'
:
0
,
'CB_DEJ'
:
0
,
'CB_DEJ'
:
0
,
'CHQ_DEJ'
:
0
,
'CHQ_DEJ'
:
0
,
'MonA'
:
0
,
'TOTAL'
:
0
}
'TOTAL'
:
0
}
sub_total
=
0
sub_total
=
0
cb
=
chq
=
csh
=
cbd
=
chqd
=
0
cb
=
chq
=
csh
=
cbd
=
chqd
=
mona
=
0
for
p
in
s
[
'payments'
]:
for
p
in
s
[
'payments'
]:
# p['name'] is a sequence generated string
# p['name'] is a sequence generated string
# Test order is important as CHEQDEJ contains CHEQ for ex.
# Test order is important as CHEQDEJ contains CHEQ for ex.
...
@@ -213,28 +214,32 @@ class ExportPOS(View):
...
@@ -213,28 +214,32 @@ class ExportPOS(View):
cbd
=
sub_amount
cbd
=
sub_amount
elif
'CB'
in
p
[
'name'
]:
elif
'CB'
in
p
[
'name'
]:
cb
=
sub_amount
cb
=
sub_amount
elif
'MonA'
in
p
[
'name'
]:
mona
=
sub_amount
sub_total
+=
sub_amount
sub_total
+=
sub_amount
totals
[
key
][
'CB'
]
+=
cb
totals
[
key
][
'CB'
]
+=
cb
totals
[
key
][
'CSH'
]
+=
csh
totals
[
key
][
'CSH'
]
+=
csh
totals
[
key
][
'CHQ'
]
+=
chq
totals
[
key
][
'CHQ'
]
+=
chq
totals
[
key
][
'CB_DEJ'
]
+=
cbd
totals
[
key
][
'CB_DEJ'
]
+=
cbd
totals
[
key
][
'CHQ_DEJ'
]
+=
chqd
totals
[
key
][
'CHQ_DEJ'
]
+=
chqd
totals
[
key
][
'MonA'
]
+=
mona
totals
[
key
][
'TOTAL'
]
+=
round
(
sub_total
,
2
)
totals
[
key
][
'TOTAL'
]
+=
round
(
sub_total
,
2
)
details_lines
.
append
([
mois
,
s
[
'mm_dates'
][
'min'
],
s
[
'mm_dates'
][
'max'
],
s
[
'caisse'
],
s
[
'name'
],
details_lines
.
append
([
mois
,
s
[
'mm_dates'
][
'min'
],
s
[
'mm_dates'
][
'max'
],
s
[
'caisse'
],
s
[
'name'
],
cb
,
csh
,
chq
,
cbd
,
chqd
,
sub_total
])
cb
,
csh
,
chq
,
cbd
,
chqd
,
mona
,
sub_total
])
wb
=
Workbook
()
wb
=
Workbook
()
ws1
=
wb
.
create_sheet
(
"Totaux "
+
mois
,
0
)
ws1
=
wb
.
create_sheet
(
"Totaux "
+
mois
,
0
)
ws2
=
wb
.
create_sheet
(
"Détails "
+
mois
,
1
)
ws2
=
wb
.
create_sheet
(
"Détails "
+
mois
,
1
)
ws1
.
append
([
'date'
,
'CB'
,
'CSH'
,
'CHQ'
,
'CB_DEJ'
,
'CHQ_DEJ'
,
'Total'
])
ws1
.
append
([
'date'
,
'CB'
,
'CSH'
,
'CHQ'
,
'CB_DEJ'
,
'CHQ_DEJ'
,
'
MonA'
,
'
Total'
])
for
day
in
sorted
(
totals
):
for
day
in
sorted
(
totals
):
cb
=
totals
[
day
][
'CB'
]
cb
=
totals
[
day
][
'CB'
]
csh
=
totals
[
day
][
'CSH'
]
csh
=
totals
[
day
][
'CSH'
]
chq
=
totals
[
day
][
'CHQ'
]
chq
=
totals
[
day
][
'CHQ'
]
cbd
=
totals
[
day
][
'CB_DEJ'
]
cbd
=
totals
[
day
][
'CB_DEJ'
]
chqd
=
totals
[
day
][
'CHQ_DEJ'
]
chqd
=
totals
[
day
][
'CHQ_DEJ'
]
mona
=
totals
[
day
][
'MonA'
]
total
=
totals
[
day
][
'TOTAL'
]
total
=
totals
[
day
][
'TOTAL'
]
ws1
.
append
([
day
,
cb
,
csh
,
chq
,
cbd
,
chqd
,
total
])
ws1
.
append
([
day
,
cb
,
csh
,
chq
,
cbd
,
chqd
,
mona
,
total
])
ws2
.
append
([
'mois'
,
'min_date'
,
'max_date'
,
'Caisse'
,
'session'
,
'CB'
,
'CSH'
,
'CHQ'
,
'CB_DEJ'
,
'CHQ_DEJ'
,
'total'
])
ws2
.
append
([
'mois'
,
'min_date'
,
'max_date'
,
'Caisse'
,
'session'
,
'CB'
,
'CSH'
,
'CHQ'
,
'CB_DEJ'
,
'CHQ_DEJ'
,
'
MonA'
,
'
total'
])
for
row
in
details_lines
:
for
row
in
details_lines
:
ws2
.
append
(
row
)
ws2
.
append
(
row
)
wb_name
=
'export_sessions__'
+
mois
+
'.xlsx'
wb_name
=
'export_sessions__'
+
mois
+
'.xlsx'
...
...
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