Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
odoo
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
0
Merge Requests
0
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
odoo
Commits
a5b7181d
Commit
a5b7181d
authored
3 years ago
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
POS: remove last product scanned from error popup
parent
6ad0f139
dev_principale
…
2144-check-if-meal-voucher-amount-is-relevant
2251-shift-screen-associate
3408-archived-products-removed
3882-explication-pour-suppression-presence
5873-prevent-special-status-to-be-lost-when-adding-capital-shares
6833--nouveaux-sans-statut
ajout_module_exports_pour_capital_membres
branch_prod_anticipee_Cagette
correctifs_lacagette_membership
curtlery_pos_meal_voucher
dev_cooperatic
docker
graoucoop_backup
graoucoop_prod
lacagette_prod
nouvelle_implentation_mails_rappel
pour_mep
revert-c649eae1
supercafoutch-prod-20220811
supercafoutch_prod
ticket_6464
test
supercafoutch_20240609_115709
supercafoutch_20240212_082431
supercafoutch_20240107_181851
supercafoutch_prod_until_240107
supercafoutch-prod-20220811
supercafoutch-230915
supercafoutch-230823
1 merge request
!38
Intégration développement Coopératic pour La Cagette
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
__openerp__.py
lacagette_addons/lacagette_custom_pos/__openerp__.py
+1
-1
backend.js
...ette_addons/lacagette_custom_pos/static/src/js/backend.js
+3
-1
qweb.xml
...gette_addons/lacagette_custom_pos/static/src/xml/qweb.xml
+2
-2
No files found.
lacagette_addons/lacagette_custom_pos/__openerp__.py
View file @
a5b7181d
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
Personnalisation de la popup d'erreur "codebarre non reconnu" :
\n
Personnalisation de la popup d'erreur "codebarre non reconnu" :
\n
- Faire clignoter la popup d'erreur quand le codebarre n'est pas reconnu
- Faire clignoter la popup d'erreur quand le codebarre n'est pas reconnu
- Jouer le son d'erreur plusieurs fois
- Jouer le son d'erreur plusieurs fois
- Afficher dans la popup le dernier produit scanné
-
[FONCTION COMMENTEE]
Afficher dans la popup le dernier produit scanné
"""
,
"""
,
'author'
:
"fracolo"
,
'author'
:
"fracolo"
,
...
...
This diff is collapsed.
Click to expand it.
lacagette_addons/lacagette_custom_pos/static/src/js/backend.js
View file @
a5b7181d
...
@@ -63,15 +63,17 @@ odoo.define('lacagette_custom_pos.DB', function(require) {
...
@@ -63,15 +63,17 @@ odoo.define('lacagette_custom_pos.DB', function(require) {
// Only on products screen
// Only on products screen
if
(
this
.
gui
.
get_current_screen
()
==
'products'
)
{
if
(
this
.
gui
.
get_current_screen
()
==
'products'
)
{
// Get last product scanned
// Get last product scanned
/*
var orderlines = this.pos.get_order().orderlines.models
var orderlines = this.pos.get_order().orderlines.models
var last_product_name = orderlines.length > 0
var last_product_name = orderlines.length > 0
? orderlines[orderlines.length-1].product.display_name
? orderlines[orderlines.length-1].product.display_name
: 'Panier vide'
: 'Panier vide'
*/
// Display custom popum with options
// Display custom popum with options
this
.
gui
.
show_popup
(
'custom-error-barcode'
,
{
this
.
gui
.
show_popup
(
'custom-error-barcode'
,
{
barcode
:
show_code
,
barcode
:
show_code
,
last_product_name
:
last_product_name
//
last_product_name: last_product_name
});
});
var
popup_barcode
=
$
(
'.popup-barcode'
)
var
popup_barcode
=
$
(
'.popup-barcode'
)
...
...
This diff is collapsed.
Click to expand it.
lacagette_addons/lacagette_custom_pos/static/src/xml/qweb.xml
View file @
a5b7181d
...
@@ -11,11 +11,11 @@
...
@@ -11,11 +11,11 @@
Le Point de Vente n'a pas pu trouver de produit associé
Le Point de Vente n'a pas pu trouver de produit associé
au code-barre scanné.
au code-barre scanné.
</p>
</p>
<p
class=
"body last-product-scanned"
>
<
!--<
p class="body last-product-scanned">
Dernier produit scanné :
Dernier produit scanné :
<br />
<br />
<b><t t-esc="widget.options.last_product_name" /></b>
<b><t t-esc="widget.options.last_product_name" /></b>
</p>
</p>
-->
<div
class=
"footer"
>
<div
class=
"footer"
>
<div
class=
"button cancel"
>
<div
class=
"button cancel"
>
...
...
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