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
79cebb4d
Commit
79cebb4d
authored
May 04, 2022
by
François C.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adaptations lisibilité colonnes
parent
d4477c71
Pipeline
#2177
passed with stage
in 1 minute 27 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
7 deletions
+17
-7
config.md
outils/config.md
+4
-0
reception_style.css
reception/static/css/reception_style.css
+6
-1
reception_produits.js
reception/static/js/reception_produits.js
+7
-6
No files found.
outils/config.md
View file @
79cebb4d
...
@@ -355,6 +355,10 @@
...
@@ -355,6 +355,10 @@
-
RECEPTION_SHELF_LABEL_PRINT = True
-
RECEPTION_SHELF_LABEL_PRINT = True
-
DISPLAY_COL_AUTRES = True
Display "Autres" column (showing select with action "rupture fournisseur")
-
COEFF_MAG_ID = 1
-
COEFF_MAG_ID = 1
DB coeff id, needed to compute product shelf price
DB coeff id, needed to compute product shelf price
...
...
reception/static/css/reception_style.css
View file @
79cebb4d
...
@@ -252,5 +252,9 @@ hr {
...
@@ -252,5 +252,9 @@ hr {
#main_content
{
width
:
100%
;}
#main_content
{
width
:
100%
;}
.select_product_action
{
.select_product_action
{
max-width
:
15px
;
max-width
:
5px
;
}
.toProcess_line_edit
,
.toProcess_line_valid
{
min-width
:
11px
;
}
}
\ No newline at end of file
reception/static/js/reception_produits.js
View file @
79cebb4d
...
@@ -355,7 +355,8 @@ function initLists() {
...
@@ -355,7 +355,8 @@ function initLists() {
// In case of group orders, add "Order" as first column for ordering
// In case of group orders, add "Order" as first column for ordering
if
(
Object
.
keys
(
orders
).
length
>
1
)
{
if
(
Object
.
keys
(
orders
).
length
>
1
)
{
columns_to_process
.
push
({
columns_to_process
.
push
({
data
:
"order_key"
,
title
:
"Comm- ande"
,
className
:
"dt-body-center"
data
:
"order_key"
,
title
:
"n°"
,
className
:
"dt-body-center"
,
width
:
"20px"
});
});
}
}
...
@@ -394,18 +395,18 @@ function initLists() {
...
@@ -394,18 +395,18 @@ function initLists() {
},
},
{
{
title
:
"Editer"
,
title
:
"Editer"
,
defaultContent
:
"<a class='btn
' id='
toProcess_line_edit' href='#'><i class='far fa-edit'></i></a>"
,
defaultContent
:
"<a class='btn
toProcess_line_edit' href='#'><i class='far fa-edit'></i></a>"
,
className
:
"dt-body-center"
,
className
:
"dt-body-center"
,
orderable
:
false
orderable
:
false
},
},
{
{
title
:
"Valider"
,
title
:
"Valider"
,
defaultContent
:
"<a class='btn
' id='
toProcess_line_valid' href='#'><i class='far fa-check-square'></i></a>"
,
defaultContent
:
"<a class='btn
toProcess_line_valid' href='#'><i class='far fa-check-square'></i></a>"
,
className
:
"dt-body-center"
,
className
:
"dt-body-center"
,
orderable
:
false
orderable
:
false
},
},
{
{
title
:
"
Autres
"
,
title
:
""
,
defaultContent
:
"<select class='select_product_action'><option value=''></option><option value='supplier_shortage'>Rupture fournisseur</option></select>"
,
defaultContent
:
"<select class='select_product_action'><option value=''></option><option value='supplier_shortage'>Rupture fournisseur</option></select>"
,
className
:
"dt-body-center"
,
className
:
"dt-body-center"
,
orderable
:
false
,
orderable
:
false
,
...
@@ -532,7 +533,7 @@ function initLists() {
...
@@ -532,7 +533,7 @@ function initLists() {
/* Listeners */
/* Listeners */
// Direct valid from to_process
// Direct valid from to_process
$
(
'#table_to_process tbody'
).
on
(
'click'
,
'a
#
toProcess_line_valid'
,
function
()
{
$
(
'#table_to_process tbody'
).
on
(
'click'
,
'a
.
toProcess_line_valid'
,
function
()
{
if
(
is_time_to
(
'reception_direct_valid_order_line'
,
500
))
{
if
(
is_time_to
(
'reception_direct_valid_order_line'
,
500
))
{
try
{
try
{
let
row
=
table_to_process
.
row
(
$
(
this
).
parents
(
'tr'
));
let
row
=
table_to_process
.
row
(
$
(
this
).
parents
(
'tr'
));
...
@@ -565,7 +566,7 @@ function initLists() {
...
@@ -565,7 +566,7 @@ function initLists() {
});
});
// Edit to_process line
// Edit to_process line
$
(
'#table_to_process tbody'
).
on
(
'click'
,
'a
#
toProcess_line_edit'
,
function
()
{
$
(
'#table_to_process tbody'
).
on
(
'click'
,
'a
.
toProcess_line_edit'
,
function
()
{
try
{
try
{
// Prevent editing mutiple lines at a time
// Prevent editing mutiple lines at a time
if
(
editing_product
==
null
)
{
if
(
editing_product
==
null
)
{
...
...
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