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
b6bf5e8d
Commit
b6bf5e8d
authored
Feb 18, 2025
by
Titouan Soulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "erp5_trade: do not check if Inventory Line if a movement to display price and quantity"
This reverts commit
6964d014
.
parent
62613fa0
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
32 additions
and
83 deletions
+32
-83
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_movement_quantity.xml
..._viewTradeFieldLibrary/my_view_mode_movement_quantity.xml
+25
-1
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view.xml
...mplateItem/portal_skins/erp5_trade/InventoryLine_view.xml
+1
-1
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_inventory.xml
...rtal_skins/erp5_trade/InventoryLine_view/my_inventory.xml
+1
-26
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_price.xml
...m/portal_skins/erp5_trade/InventoryLine_view/my_price.xml
+1
-26
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_total_quantity.xml
...skins/erp5_trade/InventoryLine_view/my_total_quantity.xml
+1
-1
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_variation_category_list.xml
...5_trade/InventoryLine_view/my_variation_category_list.xml
+1
-26
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_isQuantityEnabled.py
...tem/portal_skins/erp5_trade/Movement_isQuantityEnabled.py
+1
-1
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_isQuantityEnabled.xml
...em/portal_skins/erp5_trade/Movement_isQuantityEnabled.xml
+1
-1
No files found.
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_movement_quantity.xml
View file @
b6bf5e8d
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
<key>
<string>
delegated_list
</string>
</key>
<key>
<string>
delegated_list
</string>
</key>
<value>
<value>
<list>
<list>
<string>
editable
</string>
<string>
enabled
</string>
<string>
enabled
</string>
</list>
</list>
</value>
</value>
...
@@ -53,11 +54,17 @@
...
@@ -53,11 +54,17 @@
<value>
<value>
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
e
nabled
</string>
</key>
<key>
<string>
e
ditable
</string>
</key>
<value>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</value>
</item>
</item>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
<value>
<string></string>
</value>
...
@@ -77,6 +84,10 @@
...
@@ -77,6 +84,10 @@
<key>
<string>
values
</string>
</key>
<key>
<string>
values
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
editable
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<item>
<key>
<string>
enabled
</string>
</key>
<key>
<string>
enabled
</string>
</key>
<value>
<int>
1
</int>
</value>
<value>
<int>
1
</int>
</value>
...
@@ -100,6 +111,19 @@
...
@@ -100,6 +111,19 @@
</pickle>
</pickle>
</record>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<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_isQuantityEditable()
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
</pickle>
...
...
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view.xml
View file @
b6bf5e8d
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
<string>
my_price
</string>
<string>
my_price
</string>
<string>
my_aggregate_title_list
</string>
<string>
my_aggregate_title_list
</string>
<string>
my_total_price
</string>
<string>
my_total_price
</string>
<string>
my_total_
inventor
y
</string>
<string>
my_total_
quantit
y
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_inventory.xml
View file @
b6bf5e8d
...
@@ -9,9 +9,7 @@
...
@@ -9,9 +9,7 @@
<item>
<item>
<key>
<string>
delegated_list
</string>
</key>
<key>
<string>
delegated_list
</string>
</key>
<value>
<value>
<list>
<list/>
<string>
enabled
</string>
</list>
</value>
</value>
</item>
</item>
<item>
<item>
...
@@ -52,12 +50,6 @@
...
@@ -52,12 +50,6 @@
<key>
<string>
tales
</string>
</key>
<key>
<string>
tales
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
<value>
<string></string>
</value>
...
@@ -77,10 +69,6 @@
...
@@ -77,10 +69,6 @@
<key>
<string>
values
</string>
</key>
<key>
<string>
values
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_view_mode_movement_quantity
</string>
</value>
<value>
<string>
my_view_mode_movement_quantity
</string>
</value>
...
@@ -99,17 +87,4 @@
...
@@ -99,17 +87,4 @@
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</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>
</ZopeData>
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_price.xml
View file @
b6bf5e8d
...
@@ -9,9 +9,7 @@
...
@@ -9,9 +9,7 @@
<item>
<item>
<key>
<string>
delegated_list
</string>
</key>
<key>
<string>
delegated_list
</string>
</key>
<value>
<value>
<list>
<list/>
<string>
enabled
</string>
</list>
</value>
</value>
</item>
</item>
<item>
<item>
...
@@ -52,12 +50,6 @@
...
@@ -52,12 +50,6 @@
<key>
<string>
tales
</string>
</key>
<key>
<string>
tales
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
<value>
<string></string>
</value>
...
@@ -77,10 +69,6 @@
...
@@ -77,10 +69,6 @@
<key>
<string>
values
</string>
</key>
<key>
<string>
values
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_view_mode_price
</string>
</value>
<value>
<string>
my_view_mode_price
</string>
</value>
...
@@ -99,17 +87,4 @@
...
@@ -99,17 +87,4 @@
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</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>
</ZopeData>
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_total_
inventor
y.xml
→
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_total_
quantit
y.xml
View file @
b6bf5e8d
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_total_
inventor
y
</string>
</value>
<value>
<string>
my_total_
quantit
y
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
message_values
</string>
</key>
<key>
<string>
message_values
</string>
</key>
...
...
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_variation_category_list.xml
View file @
b6bf5e8d
...
@@ -9,9 +9,7 @@
...
@@ -9,9 +9,7 @@
<item>
<item>
<key>
<string>
delegated_list
</string>
</key>
<key>
<string>
delegated_list
</string>
</key>
<value>
<value>
<list>
<list/>
<string>
enabled
</string>
</list>
</value>
</value>
</item>
</item>
<item>
<item>
...
@@ -52,12 +50,6 @@
...
@@ -52,12 +50,6 @@
<key>
<string>
tales
</string>
</key>
<key>
<string>
tales
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
<value>
<string></string>
</value>
...
@@ -77,10 +69,6 @@
...
@@ -77,10 +69,6 @@
<key>
<string>
values
</string>
</key>
<key>
<string>
values
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_view_mode_variation_category_list
</string>
</value>
<value>
<string>
my_view_mode_variation_category_list
</string>
</value>
...
@@ -99,17 +87,4 @@
...
@@ -99,17 +87,4 @@
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</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: True
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
</ZopeData>
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_isQuantityEnabled.py
View file @
b6bf5e8d
...
@@ -15,7 +15,7 @@ to create cells and set quantities on cells.
...
@@ -15,7 +15,7 @@ to create cells and set quantities on cells.
if
context
.
getResource
()
is
None
:
if
context
.
getResource
()
is
None
:
return
False
return
False
if
not
disable_movement_check
and
not
context
.
isMovement
():
if
not
context
.
isMovement
():
return
False
return
False
resource
=
context
.
getResourceValue
()
resource
=
context
.
getResourceValue
()
...
...
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_isQuantityEnabled.xml
View file @
b6bf5e8d
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
disable_movement_check=False
</string>
</value>
<value>
<string></string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
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