Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Titouan Soulard
erp5
Commits
8a2bf6ac
Commit
8a2bf6ac
authored
Jan 21, 2025
by
Titouan Soulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_trade: use `cell` base id instead of `movement` for non-movements
parent
408faeec
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
6 deletions
+31
-6
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view.xml
...mplateItem/portal_skins/erp5_trade/InventoryCell_view.xml
+1
-1
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_price.xml
...m/portal_skins/erp5_trade/InventoryCell_view/my_price.xml
+26
-1
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewInventory/matrixbox.xml
...kins/erp5_trade/InventoryLine_viewInventory/matrixbox.xml
+1
-1
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewPrice/matrixbox.xml
...al_skins/erp5_trade/InventoryLine_viewPrice/matrixbox.xml
+1
-1
bt5/erp5_trade/TestTemplateItem/portal_components/test.erp5.testInventoryModule.py
...teItem/portal_components/test.erp5.testInventoryModule.py
+2
-2
No files found.
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view.xml
View file @
8a2bf6ac
...
...
@@ -93,8 +93,8 @@
<key>
<string>
right
</string>
</key>
<value>
<list>
<string>
my_inventory
</string>
<string>
my_quantity_unit
</string>
<string>
my_inventory
</string>
<string>
my_price
</string>
<string>
my_aggregate_title_list
</string>
</list>
...
...
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_price.xml
View file @
8a2bf6ac
...
...
@@ -9,7 +9,9 @@
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list/>
<list>
<string>
enabled
</string>
</list>
</value>
</item>
<item>
...
...
@@ -50,6 +52,12 @@
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
...
...
@@ -69,6 +77,10 @@
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_view_mode_price
</string>
</value>
...
...
@@ -87,4 +99,17 @@
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: here.Movement_isQuantityEnabled(disable_movement_check=True)
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewInventory/matrixbox.xml
View file @
8a2bf6ac
...
...
@@ -98,7 +98,7 @@
<dictionary>
<item>
<key>
<string>
cell_base_id
</string>
</key>
<value>
<string>
movement
</string>
</value>
<value>
<string>
cell
</string>
</value>
</item>
<item>
<key>
<string>
cell_portal_type
</string>
</key>
...
...
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewPrice/matrixbox.xml
View file @
8a2bf6ac
...
...
@@ -97,7 +97,7 @@
<dictionary>
<item>
<key>
<string>
cell_base_id
</string>
</key>
<value>
<string>
movement
</string>
</value>
<value>
<string>
cell
</string>
</value>
</item>
<item>
<key>
<string>
cell_portal_type
</string>
</key>
...
...
bt5/erp5_trade/TestTemplateItem/portal_components/test.erp5.testInventoryModule.py
View file @
8a2bf6ac
...
...
@@ -139,7 +139,7 @@ class TestInventoryModule(TestOrderMixin, ERP5TypeTestCase):
inventory_line_cell_range
=
[
"variation/"
+
variation
for
variation
in
inventory_line_variation_list
]
inventory_line_value
.
setVariationValueList
(
inventory_line_variation_list
)
inventory_line_value
.
setCellRange
(
inventory_line_cell_range
,
base_id
=
"
movement
"
)
inventory_line_value
.
setCellRange
(
inventory_line_cell_range
,
base_id
=
"
cell
"
)
for
variation_relative_url
,
cell
in
line
.
items
():
(
quantity
,
price
)
=
cell
...
...
@@ -149,7 +149,7 @@ class TestInventoryModule(TestOrderMixin, ERP5TypeTestCase):
variation
=
variation_relative_url
,
inventory
=
quantity
,
price
=
price
,
base_id
=
"
movement
"
,
base_id
=
"
cell
"
,
)
# Supports tuples
else
:
...
...
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