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
bc64ef6d
Commit
bc64ef6d
authored
3 years ago
by
François C.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctifs reception_index.js suite erreur affichage bouton 'commandes groupées'
parent
b83db634
dev_cooperatic
…
#5673_bug_calendrier_echange_service
3832-makeups-and-member-status-update
4081
4444_improve_presence_recording
4709
4778-reception-dont-get-finished-orders
4809-remove-shelf-value-col-to-reduce-server-load
4880-rapports-reception-faux
4950-douchage-appli-reception
5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages
5641-reception-trier-a-la-maj-prix-dans-ordre-de-pointage-quantites
6286_bug_encaissement_souscription_cheque_espece
6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template
6832--certaines-absences-engendrent-une-erreur
7723-7559-change-purchase-order-workflow-django-side
7731-third-party-side-brinks-pos-export-not-working
7747-inventaire-par-article
7800-make-test-solution-work
7848-cannot-validate-qty-with-decimal-on-kg-product
adaptation_supercafoutch
adaptation_supercoop
adaptation_supercoop_supercafoutch
adpatation_chouette
assistance_import_article
coop_dev_necessitant_modules_bdm_odoo_modifies
correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif
dev_principale
docker
export_capital_detenu
fix_bug_process_picking
fusion_custom_graoucoop
graoucoop_backup
graoucoop_prod
graoucoop_tmp
hot_fix_shelf_labels_auto_print
impression_etiquettes_rayons
integration_lien_precommandes_dans_espace_membre
lacagette_prod
local_branch
master
meal-voucher-and-label-printer-software-bug
migration-v12
pour_graoucoop_prod
pour_version_prod_cagette
refonte_espace_membre_sc
retouches_tickets_supercoop
sc-setup-stock-app
supercafoutch-preprod
supercafoutch-prod-20221003
supercafoutch_prod
ticket_4146
supercafoutch_20250120_151258
supercafoutch_20250120_150340
supercafoutch_20240909_080630
supercafoutch_20240609_115709
supercafoutch_20240212_082431
supercafoutch_20240107_181851
supercafoutch_prod_until_240107
supercafoutch-prod-20221003
supercafoutch-230911
supercafoutch-230824
supercafoutch-230823
supercafoutch-230823-the-true-one
migration-v12-tag
lacagette_20240310_074751
lacagette_20240107_122554
lacagette_20240107_120916
graoucoop_20240609_122614
cagette_testtag
cagette-230814
cagette-230630
5 merge requests
!103
WIP: Dev cooperatic
,
!50
Correctifs reception_index.js suite erreur affichage bouton 'commandes groupées'
,
!104
merge dev_cooperatic into dev_principale
,
!106
Dev principale
,
!84
Ticket 1738
Pipeline
#1228
passed with stage
in 1 minute 25 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
reception_index.js
reception/static/js/reception_index.js
+6
-4
views.py
reception/views.py
+7
-0
No files found.
reception/static/js/reception_index.js
View file @
bc64ef6d
...
...
@@ -287,7 +287,7 @@ function group_action() {
function
display_grouped_orders
()
{
if
(
table_orders
!==
null
)
{
var
display_something
=
tru
e
;
var
display_something
=
fals
e
;
$
(
'#groups_items'
).
empty
();
let
groups_display_content
=
"<ul>"
;
...
...
@@ -310,8 +310,10 @@ function display_grouped_orders() {
}
}
}
if
(
group_orders
.
length
>
0
)
{
// Display group
display_something
=
true
;
document
.
getElementById
(
"container_groups"
).
hidden
=
false
;
let
group_row
=
`<li class="group_line"> Commandes de `
;
...
...
@@ -335,8 +337,6 @@ function display_grouped_orders() {
group_row
+=
"</li>"
;
groups_display_content
+=
group_row
;
}
else
{
display_something
=
false
;
// occured making test form local django and preprod (couchdb, odoo)
}
}
if
(
display_something
===
true
)
{
...
...
@@ -354,7 +354,9 @@ function display_orders_table() {
table_orders
.
clear
().
destroy
();
$
(
'#orders'
).
empty
();
}
for
(
let
j
in
orders
)
{
console
.
log
(
orders
[
j
].
id
)
}
table_orders
=
$
(
'#orders'
).
DataTable
({
data
:
orders
,
columns
:[
...
...
This diff is collapsed.
Click to expand it.
reception/views.py
View file @
bc64ef6d
...
...
@@ -305,6 +305,8 @@ def save_error_report(request):
}
data
[
'orders'
]
.
append
(
group_order
)
else
:
coop_logger
.
info
(
"data['orders'] is a single PO (not inside group)"
)
except
Exception
as
e2
:
coop_logger
.
error
(
"Save reception report : Error while create group_order
%
s"
,
str
(
e2
))
...
...
@@ -457,6 +459,8 @@ def save_error_report(request):
error_total_abs
+=
abs
(
item
[
'error_line'
])
data_full
.
append
(
item
)
else
:
coop_logger
.
info
(
"Save reception error doc : no 'updated_products' in order (
%
s)"
,
str
(
order
))
except
Exception
as
e5
:
coop_logger
.
error
(
"Save reception report : Error while updating products
%
s"
,
str
(
e5
))
# no updated products, do nothing
...
...
@@ -592,9 +596,12 @@ def save_error_report(request):
else
:
m
=
CagetteReception
(
order
[
'id'
])
m
.
attach_file
(
fileName
)
coop_logger
.
info
(
"
%
s attached to order id
%
s"
,
fileName
,
str
(
order
[
'id'
]))
except
Exception
as
e8
:
coop_logger
.
error
(
"PO save report Error while saving file
%
s (
%
s)"
,
fileName
,
str
(
e8
))
else
:
coop_logger
.
error
(
"Save reception error report : unknown state
%
s (
%
s) "
,
str
(
data
[
'update_type'
]),
str
(
data
))
else
:
coop_logger
.
error
(
"Cant find 'orders' in data (
%
s)"
,
str
(
data
))
else
:
coop_logger
.
info
(
"Was waiting for a POST method (
%
s)"
,
str
(
request
.
method
))
...
...
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