Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
repanier
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chris
repanier
Commits
d785e9a4
Commit
d785e9a4
authored
Apr 26, 2017
by
Patrick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Also display order without delivery point -> The customer has not selected it yet
parent
e3815ebc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
2 deletions
+40
-2
repanier/admin/permanence_in_preparation.py
repanier/admin/permanence_in_preparation.py
+2
-0
repanier/xlsx/xlsx_order.py
repanier/xlsx/xlsx_order.py
+38
-2
No files found.
repanier/admin/permanence_in_preparation.py
View file @
d785e9a4
...
...
@@ -271,6 +271,8 @@ class PermanenceInPreparationAdmin(TranslatableAdmin):
user_message_level
=
messages
.
WARNING
self
.
message_user
(
request
,
user_message
,
user_message_level
)
return
# Also display order without delivery point -> The customer has not selected it yet
deliveries_to_be_exported
.
append
(
None
)
else
:
deliveries_to_be_exported
=
None
response
=
None
...
...
repanier/xlsx/xlsx_order.py
View file @
d785e9a4
...
...
@@ -41,6 +41,43 @@ def export_abstract(permanence, deliveries_id=None, group=False, wb=None):
(
_
(
'email'
),
35
),
]
wb
,
ws
=
new_portrait_a4_sheet
(
wb
,
permanence
,
EMPTY_STRING
,
header
=
header
,
add_print_title
=
False
)
customer_set
=
Customer
.
objects
.
filter
(
customerinvoice__permanence_id
=
permanence
.
id
,
represent_this_buyinggroup
=
False
,
customerinvoice__delivery__isnull
=
True
)
for
customer
in
customer_set
:
invoice
=
CustomerInvoice
.
objects
.
filter
(
permanence
=
permanence
,
customer
=
customer
).
order_by
(
'?'
).
first
()
if
invoice
is
not
None
and
invoice
.
total_price_with_tax
.
amount
!=
DECIMAL_ZERO
:
customer
.
preparation_order
=
preparation_order
customer
.
save
(
update_fields
=
[
'preparation_order'
])
preparation_order
+=
1
row
=
[
"N/A"
,
" %d - %s"
%
(
customer
.
preparation_order
,
customer
.
long_basket_name
),
customer
.
phone1
,
customer
.
phone2
,
invoice
.
total_price_with_tax
.
amount
,
# Used to send mail to customer with an order (via copy-paste to mail)
";"
.
join
(
[
customer
.
user
.
email
,
customer
.
email2
,
EMPTY_STRING
]
)
if
customer
.
email2
else
";"
.
join
(
[
customer
.
user
.
email
,
customer
.
email2
]
)
]
for
col_num
in
range
(
len
(
row
)):
c
=
ws
.
cell
(
row
=
row_num
,
column
=
col_num
)
c
.
value
=
row
[
col_num
]
if
col_num
==
4
:
c
.
style
.
number_format
.
format_code
=
repanier
.
apps
.
REPANIER_SETTINGS_CURRENCY_XLSX
else
:
c
.
style
.
number_format
.
format_code
=
NumberFormat
.
FORMAT_TEXT
c
.
style
.
alignment
.
wrap_text
=
False
if
row_num
%
2
==
0
:
c
.
style
.
borders
.
bottom
.
border_style
=
Border
.
BORDER_THIN
row_num
+=
1
for
delivery_ref
,
delivery
in
enumerate
(
DeliveryBoard
.
objects
.
filter
(
id__in
=
deliveries_id
).
order_by
(
"id"
)):
customer_set
=
Customer
.
objects
.
filter
(
customerinvoice__permanence_id
=
permanence
.
id
,
...
...
@@ -303,9 +340,8 @@ def export_customer_label(permanence, deliveries_id=None, wb=None):
if
row_num
>
0
:
ws
.
column_dimensions
[
get_column_letter
(
1
)].
width
=
120
return
wb
return
return
wb
def
customer_label
(
customer_identifier
,
placements
,
row_num
,
ws
):
...
...
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