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
85afcfb0
Commit
85afcfb0
authored
Aug 22, 2023
by
Yvon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_cooperatic' into sc-setup-stock-app
parents
563e19fa
273c7bbc
Pipeline
#2906
failed with stage
in 1 minute 12 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
config_supercafoutch.py
coops_configurations/config_supercafoutch.py
+3
-0
models.py
products/models.py
+2
-0
No files found.
coops_configurations/config_supercafoutch.py
View file @
85afcfb0
...
...
@@ -152,6 +152,9 @@ ALLOW_FOUR_DIGITS_IN_RECEPTION_PRICE = True
REMOVE_15_MINUTES_AT_SHIFT_END
=
False
# Fix incompatibility between meal voucher module and an old version of michel bibikoff product label printer software used in supercafoutch
SHOW_MEAL_VOUCHER_OK_LINE_IN_PRODUCT_INFO_FOR_LABEL
=
False
LOSSES_LOC_ID
=
33
LOSSES_PICKING_TYPE_ID
=
10
AUTOCONSO_LOC_ID
=
27
...
...
products/models.py
View file @
85afcfb0
...
...
@@ -57,6 +57,8 @@ class CagetteProduct(models.Model):
fields
=
[
'barcode'
,
'product_tmpl_id'
,
'pricetag_rackinfos'
,
'price_weight_net'
,
'price_volume'
,
'list_price'
,
'weight_net'
,
'volume'
,
'to_weight'
,
'meal_voucher_ok'
]
if
not
getattr
(
settings
,
'SHOW_MEAL_VOUCHER_OK_LINE_IN_PRODUCT_INFO_FOR_LABEL'
,
True
):
fields
.
remove
(
'meal_voucher_ok'
)
additionnal_fields
=
getattr
(
settings
,
'SHELF_LABELS_ADD_FIELDS'
,
[])
fields
+=
additionnal_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