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
756d37f7
Commit
756d37f7
authored
2 years ago
by
Thibault Grandjean
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add print action
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
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
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
!218
Ticket 4292
,
!172
add print action
Pipeline
#2176
passed with stage
in 1 minute 29 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
1 deletions
+31
-1
models.py
products/models.py
+1
-1
shelfs_admin.js
shelfs/static/js/shelfs_admin.js
+30
-0
No files found.
products/models.py
View file @
756d37f7
...
...
@@ -32,7 +32,7 @@ class CagetteProduct(models.Model):
'|'
,
[
'active'
,
'='
,
True
],
[
'active'
,
'='
,
False
]]
fields
=
[
'id'
,
'uom_id'
,
'name'
,
'qty_available'
,
'barcode'
,
'active'
,
'shelf_id'
]
fields
=
[
'id'
,
'uom_id'
,
'name'
,
'qty_available'
,
'barcode'
,
'active'
,
'shelf_id'
,
'product_tmpl_id'
]
return
api
.
search_read
(
'product.product'
,
cond
,
fields
)
...
...
This diff is collapsed.
Click to expand it.
shelfs/static/js/shelfs_admin.js
View file @
756d37f7
...
...
@@ -8,6 +8,7 @@ var main_content = $('#main-content'),
description
=
create_form
.
find
(
'textarea[name="description"]'
),
eye
=
'<i class="fas fa-eye"></i>'
,
delete_icon
=
'<i class="fas fa-trash"></i>'
,
print_icon
=
'<i class="fas fa-print"></i>'
,
add_icon
=
'<i class="fas fa-plus-circle"></i>'
,
edit_icon
=
'<i class="fas fa-edit"></i>'
,
download_icon
=
'<i class="fas fa-download"></i>'
,
...
...
@@ -361,6 +362,32 @@ var is_product_in_shelf_adding_queue_list = function(testing_pid) {
return
found
;
};
var
printProduct
=
function
()
{
let
clicked
=
$
(
this
);
let
tr_to_print
=
clicked
.
closest
(
'tr'
);
let
barcode
=
tr_to_print
.
data
(
'bc'
)
try
{
$
.
ajax
({
url
:
'/products/get_product_data'
,
data
:
{
'barcode'
:
barcode
}
})
.
done
(
function
(
res
)
{
var
product
=
res
.
product
var
product_tmpl_id
=
product
.
product_tmpl_id
[
0
]
$
.
ajax
({
url
:
'/products/label_print/'
+
product_tmpl_id
})
.
done
(
function
(
res
)
{
alert
(
'Impression lancée'
)
})
})
}
catch
(
e
)
{
alert
(
'Une erreur est survenue...'
)
}
};
var
addProductToList
=
async
function
(
barcode
)
{
if
(
barcodes
==
null
)
barcodes
=
await
init_barcodes
();
// May appens (after inactivity?)
//Get Odoo corresponding barcode
...
...
@@ -388,6 +415,8 @@ var addProductToList = async function(barcode) {
.
appendTo
(
pdt_line
);
$
(
'<td>'
).
html
(
delete_icon
)
.
appendTo
(
pdt_line
);
$
(
'<td>'
).
html
(
print_icon
)
.
appendTo
(
pdt_line
);
adding_pdts_tpl
.
find
(
'#added_products tbody'
).
append
(
pdt_line
);
main_content
.
find
(
'button.add-products'
).
css
(
'display'
,
'block'
)
.
html
(
add_pdts_btn_text
);
...
...
@@ -541,6 +570,7 @@ $(document).ready(function() {
$
(
document
).
on
(
'click'
,
'.shelfs .fa-trash'
,
deleteShelf
);
$
(
document
).
on
(
'click'
,
'.shelfs .fa-download'
,
downloadInventoryReport
);
$
(
document
).
on
(
'click'
,
'.obc .fa-trash'
,
deleteBarcodeFromList
);
$
(
document
).
on
(
'click'
,
'.obc .fa-print'
,
printProduct
);
$
(
document
).
on
(
'click'
,
'td.products .fa-plus-circle'
,
addProducts
);
$
(
document
).
on
(
'click'
,
'#main-content button.add-products'
,
recordProductsAddedShelf
);
$
(
document
).
on
(
'click'
,
'td.p_nb'
,
showProductsList
);
...
...
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