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
1
Merge Requests
1
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
d868cc4f
Project 'cooperatic/kohinos-tav' was moved to 'agplv3/kohinos-tav'. Please update any links and bookmarks that may still have the old path.
Commit
d868cc4f
authored
Oct 18, 2022
by
François C.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow 4 digits
parent
a21df69b
Pipeline
#2450
passed with stage
in 1 minute 25 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
reception_produits.js
reception/static/js/reception_produits.js
+2
-2
views.py
reception/views.py
+3
-2
reception_produits.html
templates/reception/reception_produits.html
+1
-0
No files found.
reception/static/js/reception_produits.js
View file @
d868cc4f
...
...
@@ -1182,7 +1182,7 @@ function setLineEdition(product) {
}
else
{
document
.
getElementById
(
'product_uom'
).
innerHTML
=
' / unité'
;
$
(
'#edition_input'
).
attr
(
'type'
,
'number'
)
.
attr
(
'step'
,
0.01
)
.
attr
(
'step'
,
(
allow_four_digits_in_reception_price
==
"True"
?
0.0001
:
0.01
)
)
.
attr
(
'max'
,
9999
);
}
}
else
if
(
editing_product
.
product_uom
[
0
]
==
21
)
{
// kg
...
...
@@ -1194,7 +1194,7 @@ function setLineEdition(product) {
}
else
{
document
.
getElementById
(
'product_uom'
).
innerHTML
=
' / kg'
;
$
(
'#edition_input'
).
attr
(
'type'
,
'number'
)
.
attr
(
'step'
,
0.01
)
.
attr
(
'step'
,
(
allow_four_digits_in_reception_price
==
"True"
?
0.0001
:
0.01
)
)
.
attr
(
'max'
,
9999
);
}
}
...
...
reception/views.py
View file @
d868cc4f
...
...
@@ -33,7 +33,7 @@ def home(request):
'merge_orders_pswd'
:
getattr
(
settings
,
'RECEPTION_MERGE_ORDERS_PSWD'
,
'makeastop'
),
'couchdb_server'
:
settings
.
COUCHDB
[
'url'
],
'db'
:
settings
.
COUCHDB
[
'dbs'
][
'reception'
],
'POUCHDB_VERSION'
:
getattr
(
settings
,
'POUCHDB_VERSION'
,
''
)
'POUCHDB_VERSION'
:
getattr
(
settings
,
'POUCHDB_VERSION'
,
''
)
,
}
template
=
loader
.
get_template
(
'reception/index.html'
)
...
...
@@ -93,7 +93,8 @@ def produits(request, id):
"ADD_ALL_LEFT_IS_GOOD_QTIES"
:
False
,
"ADD_ALL_LEFT_IS_GOOD_PRICES"
:
False
,
'add_products_pswd'
:
getattr
(
settings
,
'RECEPTION_ADD_PRODUCTS_PSWD'
,
'makeastop'
),
'update_qty_pswd'
:
getattr
(
settings
,
'RECEPTION_UPDATE_QTY_PSWD'
,
'makeastop'
)
'update_qty_pswd'
:
getattr
(
settings
,
'RECEPTION_UPDATE_QTY_PSWD'
,
'makeastop'
),
'allow_four_digits_in_reception_price'
:
getattr
(
settings
,
'ALLOW_FOUR_DIGITS_IN_RECEPTION_PRICE'
,
False
),
}
fixed_barcode_prefix
=
'0490'
...
...
templates/reception/reception_produits.html
View file @
d868cc4f
...
...
@@ -245,6 +245,7 @@
var
add_all_left_is_good_prices
=
"{{ADD_ALL_LEFT_IS_GOOD_PRICES}}"
var
add_products_pswd
=
"{{add_products_pswd}}"
var
update_qty_pswd
=
"{{update_qty_pswd}}"
var
allow_four_digits_in_reception_price
=
'{{allow_four_digits_in_reception_price}}'
;
</script>
<script
src=
"{% static "
js
/
all_common
.
js
"
%}?
v=
1651853225"
></script>
<script
src=
'{% static "js/barcodes.js" %}?v=1651853225'
></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