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
263c35e2
Commit
263c35e2
authored
Jul 26, 2023
by
Yvon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make meal_voucher module compatible with old version of logiciel impression etiquettes produits
parent
1d62cd4b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
config_supercafoutch.py
coops_configurations/config_supercafoutch.py
+5
-2
models.py
products/models.py
+2
-0
No files found.
coops_configurations/config_supercafoutch.py
View file @
263c35e2
...
@@ -91,4 +91,7 @@ FL_SHELFS = []
...
@@ -91,4 +91,7 @@ FL_SHELFS = []
VRAC_SHELFS
=
[]
VRAC_SHELFS
=
[]
# Should block service exchange if old service is happening in less than 24h
# Should block service exchange if old service is happening in less than 24h
BLOCK_SERVICE_EXCHANGE_24H_BEFORE
=
False
BLOCK_SERVICE_EXCHANGE_24H_BEFORE
=
False
\ No newline at end of file
# Fix incompatibility between meal voucher module and an old version of michel bibikoff product label printer software used in supercafoutch
DO_NOT_SHOW_MEAL_VOUCHER_OK_LINE_IN_PRODUCT_INFO_FOR_LABEL
=
True
\ No newline at end of file
products/models.py
View file @
263c35e2
...
@@ -57,6 +57,8 @@ class CagetteProduct(models.Model):
...
@@ -57,6 +57,8 @@ class CagetteProduct(models.Model):
fields
=
[
'barcode'
,
'product_tmpl_id'
,
'pricetag_rackinfos'
,
fields
=
[
'barcode'
,
'product_tmpl_id'
,
'pricetag_rackinfos'
,
'price_weight_net'
,
'price_volume'
,
'list_price'
,
'price_weight_net'
,
'price_volume'
,
'list_price'
,
'weight_net'
,
'volume'
,
'to_weight'
,
'meal_voucher_ok'
]
'weight_net'
,
'volume'
,
'to_weight'
,
'meal_voucher_ok'
]
if
getattr
(
settings
,
'DO_NOT_SHOW_MEAL_VOUCHER_OK_LINE_IN_PRODUCT_INFO_FOR_LABEL'
,
False
):
fields
.
remove
(
'meal_voucher_ok'
)
additionnal_fields
=
getattr
(
settings
,
'SHELF_LABELS_ADD_FIELDS'
,
[])
additionnal_fields
=
getattr
(
settings
,
'SHELF_LABELS_ADD_FIELDS'
,
[])
fields
+=
additionnal_fields
fields
+=
additionnal_fields
product_data
=
api
.
search_read
(
'product.product'
,
cond
,
fields
)
product_data
=
api
.
search_read
(
'product.product'
,
cond
,
fields
)
...
...
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