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
e0b4c3d8
Commit
e0b4c3d8
authored
2 years ago
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
INV: display last product added date
parent
793d102f
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
7819-prevent-adding-product-already-in-order
7848-cannot-validate-qty-with-decimal-on-kg-product
7918_bug_quantites_stade_demande_prix
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
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
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
2 merge requests
!169
INV: display last product added date
,
!218
Ticket 4292
Pipeline
#2165
passed with stage
in 1 minute 28 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
1 deletions
+35
-1
admin.py
shelfs/admin.py
+5
-1
models.py
shelfs/models.py
+12
-0
shelfs_index.js
shelfs/static/js/shelfs_index.js
+18
-0
No files found.
shelfs/admin.py
View file @
e0b4c3d8
...
@@ -58,7 +58,11 @@ def add_products(request):
...
@@ -58,7 +58,11 @@ def add_products(request):
try
:
try
:
id
=
int
(
request
.
POST
.
get
(
'shelf_id'
))
id
=
int
(
request
.
POST
.
get
(
'shelf_id'
))
barcodes
=
json
.
loads
(
request
.
POST
.
get
(
'bc'
))
barcodes
=
json
.
loads
(
request
.
POST
.
get
(
'bc'
))
result
=
Shelf
(
id
)
.
add_products_by_barcodes
(
barcodes
)
m
=
Shelf
(
id
)
result
=
m
.
add_products_by_barcodes
(
barcodes
)
# Update shelf last product added date
result
[
"update_last_product_added_date"
]
=
m
.
update_last_product_added_date
()
except
Exception
as
e
:
except
Exception
as
e
:
result
[
'error'
]
=
str
(
e
)
result
[
'error'
]
=
str
(
e
)
else
:
else
:
...
...
This diff is collapsed.
Click to expand it.
shelfs/models.py
View file @
e0b4c3d8
...
@@ -180,6 +180,18 @@ class Shelf(models.Model):
...
@@ -180,6 +180,18 @@ class Shelf(models.Model):
res
[
'error'
]
=
"L'enregistrement n'a pas pu se réaliser"
res
[
'error'
]
=
"L'enregistrement n'a pas pu se réaliser"
return
res
return
res
def
update_last_product_added_date
(
self
):
res
=
{}
today
=
date
.
today
()
.
strftime
(
"
%
Y-
%
m-
%
d"
)
f
=
{
'date_last_product_added'
:
today
}
try
:
res
[
"update"
]
=
self
.
o_api
.
update
(
'product.shelfs'
,
self
.
id
,
f
)
except
Exception
as
e
:
res
[
'error'
]
=
str
(
e
)
return
res
def
save_tmp_inventory
(
self
,
inventory_data
):
def
save_tmp_inventory
(
self
,
inventory_data
):
"""Save inventory data in a json temp file"""
"""Save inventory data in a json temp file"""
...
...
This diff is collapsed.
Click to expand it.
shelfs/static/js/shelfs_index.js
View file @
e0b4c3d8
...
@@ -15,6 +15,24 @@ function init_datatable() {
...
@@ -15,6 +15,24 @@ function init_datatable() {
{
data
:
"name"
,
title
:
"Nom"
},
{
data
:
"name"
,
title
:
"Nom"
},
{
data
:
"description"
,
title
:
"Description"
,
orderable
:
false
},
{
data
:
"description"
,
title
:
"Description"
,
orderable
:
false
},
{
{
data
:
"date_last_product_added"
,
title
:
"Dernier ajout produit"
,
render
:
function
(
data
,
type
)
{
// Sort on data, not rendering
if
(
type
==
"sort"
||
type
==
'type'
)
return
data
;
if
(
data
==
'0001-01-01'
)
return
""
;
else
{
var
date
=
new
Date
(
data
);
return
date
.
toLocaleDateString
(
'fr-FR'
);
}
}
},
{
data
:
"date_last_inventory"
,
data
:
"date_last_inventory"
,
title
:
"Date dernier inventaire"
,
title
:
"Date dernier inventaire"
,
render
:
function
(
data
,
type
,
full
,
meta
)
{
render
:
function
(
data
,
type
,
full
,
meta
)
{
...
...
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