Skip to content

erp5
erp5
Commit 6417743b authored by Grégory Wisniewski's avatar Grégory Wisniewski
Browse files
Options

Allow filter by checkbook model and title in checkbook delivery. 

Add to search fields in the fast input to easily search for checks.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37833 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c60a9de9
Hide whitespace changes
Inline Side-by-side
Showing with 610 additions and 5 deletions
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_fastInputForm.xml
View file @ 6417743b
...@@ -96,6 +96,8 @@ ...@@ -96,6 +96,8 @@
<list> <list>
<string>your_fast_input_type</string> <string>your_fast_input_type</string>
<string>your_reference</string> <string>your_reference</string>
<string>your_title</string>
<string>your_checkbook_model</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_fastInputForm/listbox.xml
View file @ 6417743b
...@@ -426,7 +426,7 @@ ...@@ -426,7 +426,7 @@
</item> </item>
<item> <item>
<key> <string>lines</string> </key> <key> <string>lines</string> </key>
<value> <int>20</int> </value> <value> <int>50</int> </value>
</item> </item>
<item> <item>
<key> <string>list_action</string> </key> <key> <string>list_action</string> </key>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_fastInputForm/your_checkbook_model.xml 0 → 100644
View file @ 6417743b
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ListField" module="Products.Formulator.StandardFields"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_checkbook_model</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>unknown_selection</string> </key>
<value> <string>You selected an item that was not in the list.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Checkbook Model</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:[(\'\', \'\')] + context.CheckDetail_getItemModelItemList()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_fastInputForm/your_title.xml 0 → 100644
View file @ 6417743b
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="StringField" module="Products.Formulator.StandardFields"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_title</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>too_long</string> </key>
<value> <string>Too much input was given.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Range</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_getCheckbookList.xml
View file @ 6417743b
...@@ -99,11 +99,22 @@ if listbox is None:\n ...@@ -99,11 +99,22 @@ if listbox is None:\n
destination_payment_internal_bank_account_number=reference,\n destination_payment_internal_bank_account_number=reference,\n
portal_type=(\'Check\', \'Checkbook\')\n portal_type=(\'Check\', \'Checkbook\')\n
)]\n )]\n
\n
if checkbook_model not in (None, \'\'):\n
checkbook_model_uid = context.getPortalObject().restrictedTraverse(checkbook_model).getUid()\n
kw[\'resource_uid\'] = checkbook_model_uid\n
\n
search_criterion = \'\'\n
if title not in (None, \'\'):\n
# FIXME: this doesn\'t work with current catalog and simulation tool\n
# build a SQL statement to bypass this limitation\n
#kw[\'item_catalog.title\'] = title\n
search_criterion = " AND item_catalog.title LIKE \'%s\'" % title\n
\n \n
current_tracking_list = getCurrentTrackingList(\n current_tracking_list = getCurrentTrackingList(\n
to_date=at_date,\n to_date=at_date,\n
node=node,\n node=node,\n
where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'",\n where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\' %s" % search_criterion,\n
**kw)\n **kw)\n
\n \n
if count is True:\n if count is True:\n
...@@ -168,7 +179,7 @@ return listbox\n ...@@ -168,7 +179,7 @@ return listbox\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>listbox=None, item_portal_type_list=None,destination_payment=None,model_filter_dict=None,batch_mode=0,simulation_state=None,disable_node=0,at_date=None,reference=None,limit=None,count=False,**kw</string> </value> <value> <string>listbox=None, item_portal_type_list=None,destination_payment=None,model_filter_dict=None,batch_mode=0,simulation_state=None,disable_node=0,at_date=None,reference=None,checkbook_model=None,title=None,limit=None,count=False,**kw</string> </value>
</item> </item>
<item> <item>
<key> <string>_proxy_roles</string> </key> <key> <string>_proxy_roles</string> </key>
...@@ -196,7 +207,7 @@ return listbox\n ...@@ -196,7 +207,7 @@ return listbox\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>11</int> </value> <value> <int>13</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -211,6 +222,8 @@ return listbox\n ...@@ -211,6 +222,8 @@ return listbox\n
<string>disable_node</string> <string>disable_node</string>
<string>at_date</string> <string>at_date</string>
<string>reference</string> <string>reference</string>
<string>checkbook_model</string>
<string>title</string>
<string>limit</string> <string>limit</string>
<string>count</string> <string>count</string>
<string>kw</string> <string>kw</string>
...@@ -231,6 +244,8 @@ return listbox\n ...@@ -231,6 +244,8 @@ return listbox\n
<string>$append0</string> <string>$append0</string>
<string>x</string> <string>x</string>
<string>_write_</string> <string>_write_</string>
<string>checkbook_model_uid</string>
<string>search_criterion</string>
<string>_apply_</string> <string>_apply_</string>
<string>current_tracking_list</string> <string>current_tracking_list</string>
<string>True</string> <string>True</string>
...@@ -268,6 +283,8 @@ return listbox\n ...@@ -268,6 +283,8 @@ return listbox\n
<none/> <none/>
<none/> <none/>
<none/> <none/>
<none/>
<none/>
<int>0</int> <int>0</int>
</tuple> </tuple>
</value> </value>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/ListBox_countCheckbook.xml
View file @ 6417743b
...@@ -76,12 +76,24 @@ reference = getattr(request, \'your_reference\', None)\n ...@@ -76,12 +76,24 @@ reference = getattr(request, \'your_reference\', None)\n
if reference is None:\n if reference is None:\n
reference = getattr(request, \'field_your_reference\', None)\n reference = getattr(request, \'field_your_reference\', None)\n
\n \n
# filter by checkbook model\n
checkbook_model = getattr(request, \'your_checkbook_model\', None)\n
if checkbook_model is None:\n
checkbook_model = getattr(request, \'field_your_checkbook_model\', None)\n
\n
# filter by title (check numbers)\n
title = getattr(request, \'your_title\', None)\n
if title is None:\n
title = getattr(request, \'field_your_title\', None)\n
\n
nb = context.Delivery_getCheckbookList(\n nb = context.Delivery_getCheckbookList(\n
item_portal_type_list=item_portal_type_list,\n item_portal_type_list=item_portal_type_list,\n
disable_node=disable_node,\n disable_node=disable_node,\n
at_date=at_date,\n at_date=at_date,\n
node=node,\n node=node,\n
reference=reference,\n reference=reference,\n
title=title,\n
checkbook_model=checkbook_model, \n
count=True)\n count=True)\n
\n \n
return [[nb,],]\n return [[nb,],]\n
...@@ -134,6 +146,8 @@ return [[nb,],]\n ...@@ -134,6 +146,8 @@ return [[nb,],]\n
<string>disable_node</string> <string>disable_node</string>
<string>at_date</string> <string>at_date</string>
<string>reference</string> <string>reference</string>
<string>checkbook_model</string>
<string>title</string>
<string>True</string> <string>True</string>
<string>nb</string> <string>nb</string>
</tuple> </tuple>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/ListBox_listCheckbook.xml
View file @ 6417743b
...@@ -77,6 +77,16 @@ reference = getattr(request, \'your_reference\', None)\n ...@@ -77,6 +77,16 @@ reference = getattr(request, \'your_reference\', None)\n
if reference is None:\n if reference is None:\n
reference = getattr(request, \'field_your_reference\', None)\n reference = getattr(request, \'field_your_reference\', None)\n
\n \n
# filter by checkbook model\n
checkbook_model = getattr(request, \'your_checkbook_model\', None)\n
if checkbook_model is None:\n
checkbook_model = getattr(request, \'field_your_checkbook_model\', None)\n
\n
# filter by title (check numbers)\n
title = getattr(request, \'your_title\', None)\n
if title is None:\n
title = getattr(request, \'field_your_title\', None)\n
\n
disable_node = 0\n disable_node = 0\n
at_date = context.getStartDate()\n at_date = context.getStartDate()\n
if fast_input_type == \'traveler_check_purchase\':\n if fast_input_type == \'traveler_check_purchase\':\n
...@@ -108,6 +118,8 @@ listbox = context.Delivery_getCheckbookList(\n ...@@ -108,6 +118,8 @@ listbox = context.Delivery_getCheckbookList(\n
at_date=at_date,\n at_date=at_date,\n
node=node,\n node=node,\n
reference=reference,\n reference=reference,\n
title=title,\n
checkbook_model=checkbook_model,\n
limit=limit)\n limit=limit)\n
context.Base_updateDialogForm(listbox=listbox)\n context.Base_updateDialogForm(listbox=listbox)\n
\n \n
...@@ -166,6 +178,8 @@ return context.ListBox_initializeFastInput()\n ...@@ -166,6 +178,8 @@ return context.ListBox_initializeFastInput()\n
<string>getattr</string> <string>getattr</string>
<string>fast_input_type</string> <string>fast_input_type</string>
<string>reference</string> <string>reference</string>
<string>checkbook_model</string>
<string>title</string>
<string>disable_node</string> <string>disable_node</string>
<string>at_date</string> <string>at_date</string>
<string>_write_</string> <string>_write_</string>
......
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