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
3
Merge Requests
3
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
48cfbd78
Commit
48cfbd78
authored
3 years ago
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove npa products
parent
419d56c0
2 merge requests
!106
Dev principale
,
!45
Intégration des Dev cooperatic (Aide à la commande, Réception avec cache couchDB, possibilité de valider une présence Comité)
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
3 deletions
+16
-3
orders_helper.js
orders/static/js/orders_helper.js
+15
-2
helper.html
templates/orders/helper.html
+1
-1
No files found.
orders/static/js/orders_helper.js
View file @
48cfbd78
...
@@ -500,7 +500,20 @@ function set_product_npa(p_id, npa) {
...
@@ -500,7 +500,20 @@ function set_product_npa(p_id, npa) {
success
:
()
=>
{
success
:
()
=>
{
const
index
=
products
.
findIndex
(
p
=>
p
.
id
==
p_id
);
const
index
=
products
.
findIndex
(
p
=>
p
.
id
==
p_id
);
products
[
index
].
purchase_ok
=
data
[
"purchase_ok"
];
// Give time for modal to fade
setTimeout
(
function
()
{
$
.
notify
(
"Produit passé en NPA !"
,
{
globalPosition
:
"top right"
,
className
:
"success"
}
);
},
500
);
// Remove NPA products
products
.
splice
(
index
,
1
);
update_main_screen
();
update_cdb_order
();
update_cdb_order
();
closeModal
();
closeModal
();
...
@@ -1000,7 +1013,7 @@ function prepare_datatable_data(product_ids = []) {
...
@@ -1000,7 +1013,7 @@ function prepare_datatable_data(product_ids = []) {
daily_conso
:
product
.
daily_conso
,
daily_conso
:
product
.
daily_conso
,
purchase_ok
:
product
.
purchase_ok
,
purchase_ok
:
product
.
purchase_ok
,
uom
:
product
.
uom_id
[
1
],
uom
:
product
.
uom_id
[
1
],
stats
:
`Ecart type:
${
product
.
sigma
}
/ Jours sans vente:
${
(
product
.
vpc
)
*
100
}
%`
stats
:
`Ecart type:
${
product
.
sigma
}
/ Jours sans vente:
${
Math
.
round
((
product
.
vpc
)
*
100
)
}
%`
};
};
const
computed_data
=
_compute_product_data
(
product
);
const
computed_data
=
_compute_product_data
(
product
);
...
...
This diff is collapsed.
Click to expand it.
templates/orders/helper.html
View file @
48cfbd78
...
@@ -196,7 +196,7 @@
...
@@ -196,7 +196,7 @@
<h3>
Attention !
</h3>
<h3>
Attention !
</h3>
<p>
<p>
Vous vous apprêtez à passer le produit
<span
class=
"product_name"
></span>
en
<span
class=
"product_npa"
></span>
.
<br/>
Vous vous apprêtez à passer le produit
<span
class=
"product_name"
></span>
en
<span
class=
"product_npa"
></span>
.
<br/>
L'information sera enregistrée dès que vous aurez cliqué sur "Valider"
.
Dès que vous aurez cliqué sur "Valider", le produit sera retiré du tableau et l'information sera enregistrée dans Odoo
.
</p>
</p>
<p>
Êtez-vous sûr ?
</p>
<p>
Êtez-vous sûr ?
</p>
<hr/>
<hr/>
...
...
This diff is collapsed.
Click to expand it.
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