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
5959ace7
Commit
5959ace7
authored
Jun 09, 2021
by
Arnaud B
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
suppression de la colonne Autres pour La Cagette uniquement
parent
f520fc11
Pipeline
#1044
passed with stage
in 21 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
reception_produits.js
reception/static/js/reception_produits.js
+3
-1
views.py
reception/views.py
+3
-1
reception_produits.html
templates/reception/reception_produits.html
+1
-0
No files found.
reception/static/js/reception_produits.js
View file @
5959ace7
...
...
@@ -275,7 +275,8 @@ function initLists() {
title
:
"Autres"
,
defaultContent
:
"<select class='select_product_action'><option value=''></option><option value='supplier_shortage'>Rupture fournisseur</option></select>"
,
className
:
"dt-body-center"
,
orderable
:
false
orderable
:
false
,
visible
:
display_autres
}
],
rowId
:
"product_id.0"
,
...
...
@@ -346,6 +347,7 @@ function initLists() {
title
:
"Autres"
,
className
:
"dt-body-center"
,
orderable
:
false
,
visible
:
display_autres
,
render
:
function
(
data
,
type
,
full
)
{
let
disabled
=
(
full
.
supplier_shortage
)
?
"disabled"
:
''
;
...
...
reception/views.py
View file @
5959ace7
...
...
@@ -76,7 +76,9 @@ def get_list_orders(request):
def
produits
(
request
,
id
):
""" Gets Order details """
context
=
{
'title'
:
'Réception des produits'
,
"TOOLS_SERVER"
:
settings
.
TOOLS_SERVER
}
"TOOLS_SERVER"
:
settings
.
TOOLS_SERVER
,
"DISPLAY_AUTRES"
:
"false"
if
(
settings
.
COMPANY_NAME
==
"La Cagette"
)
else
"true"
,
}
fixed_barcode_prefix
=
'0490'
if
hasattr
(
settings
,
'RECEPTION_PB'
):
...
...
templates/reception/reception_produits.html
View file @
5959ace7
...
...
@@ -183,6 +183,7 @@
<script
type=
"text/javascript"
>
var
tools_server
=
'{{TOOLS_SERVER}}'
var
fixed_barcode_prefix
=
'{{FIXED_BARCODE_PREFIX}}'
var
display_autres
=
{{
DISPLAY_AUTRES
}};
</script>
<script
src=
"{% static "
js
/
all_common
.
js
"
%}?
v=
"></script>
<script src='{% static "
js
/
barcodes
.
js
"
%}?
v=
'></script>
...
...
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