Skip to content

erp5
erp5
Commit 49bc98cb authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

WIP BROKEN [erp5[_mrp]_item] new action 

Do not access form submission REQUEST from the listbox list method,
as it is rendered asynchronously in ERP5JS
parent fed81351
Show whitespace changes
Inline Side-by-side
Showing with 109 additions and 58 deletions
bt5/erp5_item/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/item_creation.xml
View file @ 49bc98cb
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_fast_input</string>
<string>action_type/object_jio_fast_input</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_fast_input</string> </value>
<value> <string>object_jio_fast_input</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -32,7 +32,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -73,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog</string> </value>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Order%20Line/item_creation.xml
View file @ 49bc98cb
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_fast_input</string>
<string>action_type/object_jio_fast_input</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_fast_input</string> </value>
<value> <string>object_jio_fast_input</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -32,7 +32,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -73,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog</string> </value>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/item_creation.xml
View file @ 49bc98cb
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_fast_input</string>
<string>action_type/object_jio_fast_input</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_fast_input</string> </value>
<value> <string>object_jio_fast_input</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -32,7 +32,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -73,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog</string> </value>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/item_creation.xml
View file @ 49bc98cb
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_fast_input</string>
<string>action_type/object_jio_fast_input</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_fast_input</string> </value>
<value> <string>object_jio_fast_input</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -32,7 +32,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -73,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog</string> </value>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/item_creation.xml
View file @ 49bc98cb
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_fast_input</string>
<string>action_type/object_jio_fast_input</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_fast_input</string> </value>
<value> <string>object_jio_fast_input</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -32,7 +32,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -73,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog</string> </value>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Order%20Line/item_creation.xml
View file @ 49bc98cb
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_fast_input</string>
<string>action_type/object_jio_fast_input</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_fast_input</string> </value>
<value> <string>object_jio_fast_input</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -32,7 +32,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -73,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog</string> </value>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/item_creation.xml
View file @ 49bc98cb
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_fast_input</string>
<string>action_type/object_jio_fast_input</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_fast_input</string> </value>
<value> <string>object_jio_fast_input</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -32,7 +32,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -73,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog</string> </value>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.py
View file @ 49bc98cb
from Products.ERP5Type.Document import newTempDeliveryLine
portal = context.getPortalObject()
try:
count = int(context.REQUEST.get('field_your_item_count', ''))
except ValueError:
count = 10
result = []
for i in range(count):
obj = portal.newContent(
portal_type='Movement',
temp_object=True,
id="tmp_item_%s" % i,
uid="new_item_%s" % i)
for i in range(item_count):
obj = newTempDeliveryLine(portal, id="tmp_item_%s" % i, uid="new_item_%s" % i)
result.append(obj)
return result
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.xml
View file @ 49bc98cb
......@@ -50,7 +50,7 @@
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value>
<value> <string>item_count=10, *args, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_selectItemList.py
View file @ 49bc98cb
......@@ -55,8 +55,10 @@ if message:
# Script stop here
context.Base_updateDialogForm(listbox=listbox,update=1, kw=kw)
REQUEST = portal.REQUEST
REQUEST.set('portal_status_message', message)
return getattr(context, REQUEST.form['dialog_id'])(listbox=listbox, kw=kw)
return context.Base_renderForm(
REQUEST.form['dialog_id'],
keep_items={'portal_status_message': message}
)
for item_uid in uids:
item = getObject(item_uid)
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.py
View file @ 49bc98cb
request = context.REQUEST
portal = context.getPortalObject()
Base_translateString = portal.Base_translateString
# FIXME: this is a workaround, because if listbox is present in request.form,
# editable fields will be empty when re-displaying the dialog.
request.form.pop('listbox', None)
request.other.pop('listbox', None)
return getattr(context, dialog_id)(**kw)
context.Base_updateDialogForm()
return context.Base_renderForm(
dialog_id,
keep_items={'portal_status_message': Base_translateString('Updated')}
)
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/listbox.xml
View file @ 49bc98cb
......@@ -11,6 +11,7 @@
<value>
<list>
<string>columns</string>
<string>default_params</string>
<string>editable_columns</string>
<string>lines</string>
<string>list_method</string>
......@@ -62,6 +63,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>default_params</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>editable_columns</string> </key>
<value> <string></string> </value>
......@@ -77,7 +84,7 @@
<item>
<key> <string>lines</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
......@@ -130,6 +137,17 @@
</list>
</value>
</item>
<item>
<key> <string>default_params</string> </key>
<value>
<list>
<tuple>
<string>checked_permission</string>
<string>View</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>editable_columns</string> </key>
<value>
......@@ -176,7 +194,7 @@
<item>
<key> <string>list_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
<item>
......@@ -214,12 +232,25 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: 0</string> </value>
<value> <string>python: [(\'checked_permission\', \'View\'), (\'item_count\', int(context.REQUEST.get(\'field_your_item_count\', \'10\')))]</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: 0</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
......
bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Manufacturing%20Execution%20Line/item_creation.xml
View file @ 49bc98cb
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_fast_input</string>
<string>action_type/object_jio_fast_input</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_fast_input</string> </value>
<value> <string>object_jio_fast_input</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -32,7 +32,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -73,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog</string> </value>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Production%20Order%20Line/item_creation.xml
View file @ 49bc98cb
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_fast_input</string>
<string>action_type/object_jio_fast_input</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_fast_input</string> </value>
<value> <string>object_jio_fast_input</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -32,7 +32,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -73,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog</string> </value>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/item_creation.xml
View file @ 49bc98cb
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_fast_input</string>
<string>action_type/object_jio_fast_input</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_fast_input</string> </value>
<value> <string>object_jio_fast_input</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -32,7 +32,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......@@ -73,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog</string> </value>
<value> <string>string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1</string> </value>
</item>
</dictionary>
</pickle>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7