Skip to content

erp5
erp5
Commit 6e5b4306 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

a few bug fixes in the user interface of traveler check sale/purchase 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11208 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a00b37e6
Show whitespace changes
Inline Side-by-side
Showing with 464 additions and 231 deletions
bt5/erp5_banking_check/ModuleTemplateItem/traveler_check_purchase_module.xml
View file @ 6e5b4306
<module>
<id>traveler_check_purchase_module</id>
<permission_list>
<permission type='list'>
<permission type='tuple'>
<name>Access Transient Objects</name>
</permission>
<permission type='list'>
<role>Assignee</role>
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
<role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Access arbitrary user session data</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Access contents information</name>
</permission>
<permission type='list'>
<role>Assignee</role>
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
<role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Access future portal content</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Access inactive portal content</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Access session data</name>
</permission>
<permission type='list'>
<role>Assignee</role>
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
<role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add Accelerated HTTP Cache Managers</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add BTreeFolder2s</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Browser Id Manager</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMF Action Icons Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMF Active Processs</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMF Caching Policy Managers</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMF Calendar Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMF Core Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMF Default Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMF Report Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMF Setup Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMF Sites</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMF Unique Id Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMFActivity Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMFCategory Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add CMFMailIn Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Configured CMF Sites</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Content Type Registrys</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Cookie Crumblers</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Database Methods</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Documents, Images, and Files</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5 Filesystem Formulator Forms</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5 Forms</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5 OOo Templates</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5 PDF Forms</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5 PDF Templates</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5 Publications</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5 Reports</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5 Sites</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5 Subscriptions</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5 Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5Catalog Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5Form Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5Subversion Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5SyncML Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ERP5Type Tools</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ExtFiles</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ExtImages</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add External Methods</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Filesystem Directory Views</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Folders</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Formulator Forms</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add LocalContents</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add LocalFolders</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Localizers</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add MailHost objects</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add MessageCatalogs</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Page Templates</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Photo Folders</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Photos</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Pluggable Index</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Plugin Registrys</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Python Scripts</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add RAM Cache Managers</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ReStructuredText Documents</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Session Data Manager</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Site Roots</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Temporary Folder</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Transient Object Container</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add User Folders</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Versions</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Virtual Host Monsters</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Vocabularies</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Z Gadfly Database Connections</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Z MySQL Database Connections</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Z MySQL Deferred Database Connections</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ZCatalogs</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ZMailIn Clients</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ZMailMessages</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add ZODB Mount Points</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add Zope Tutorials</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add portal content</name>
<role>Assignor</role>
<role>Author</role>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add portal events</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add portal folders</name>
<role>Assignor</role>
<role>Author</role>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add portal member</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Add portal topics</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change Browser Id Manager</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change DTML Documents</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change DTML Methods</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change Database Connections</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change Database Methods</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change ExtFile/ExtImage</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change External Methods</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change Formulator Fields</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change Formulator Forms</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change Images and Files</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change Lock Information</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change Page Templates</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change Photo</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change Python Scripts</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change Session Data Manager</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change Versions</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change ZMailIn</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change ZMailMessages</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change bindings</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change cache managers</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change cache settings</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change configuration</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change local roles</name>
<role>Assignor</role>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change permissions</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change portal events</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change portal topics</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Create Transient Objects</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Create class instances</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Define permissions</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Delete objects</name>
<role>Assignor</role>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Download ExtFile/ExtImage</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Edit Factories</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Edit ParsedXML</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Edit ReStructuredText</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Edit target</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>FTP access</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Import/Export objects</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Join/leave Versions</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>List folder contents</name>
</permission>
<permission type='list'>
<role>Assignee</role>
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
<role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>List portal members</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>List undoable changes</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Log Site Errors</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Log to the Event Log</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Mail forgotten password</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage Access Rules</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage Groups</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage Selenium test cases</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage Vocabulary</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage WebDAV Locks</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage Z Classes</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage ZCatalog Entries</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage ZCatalogIndex Entries</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage extensions</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage languages</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage messages</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage portal</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage properties</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Manage users</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Modify Cookie Crumblers</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Modify portal content</name>
<role>Assignor</role>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Open/Close Database Connection</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Open/Close Database Connections</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Post mail to ZMailIn</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Query Vocabulary</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Reply to item</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Request review</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Review portal content</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Save/discard Version changes</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Search ZCatalog</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Search for principals</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Set own password</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Set own properties</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Take ownership</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Test Database Connections</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Translate Content</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Undo changes</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Use Database Methods</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Use Factories</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Use external editor</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>Use mailhost services</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>View</name>
</permission>
<permission type='list'>
<role>Assignee</role>
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
<role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>View DOM hierarchy</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>View History</name>
</permission>
<permission type='list'>
<role>Assignee</role>
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
<role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>View ZMailMessage</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>View management screens</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>WebDAV Lock items</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>WebDAV Unlock items</name>
<role>Manager</role>
</permission>
<permission type='list'>
<permission type='tuple'>
<name>WebDAV access</name>
<role>Manager</role>
</permission>
</permission_list>
<portal_type>Traveler Check Purchase Module</portal_type>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view.xml
View file @ 6e5b4306
......@@ -91,7 +91,7 @@
<key> <string>center</string> </key>
<value>
<list>
<string>my_simulation_state</string>
<string>my_translated_simulation_state</string>
</list>
</value>
</item>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_simulation_state.xml → bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_translated_simulation_state.xml
View file @ 6e5b4306
......@@ -14,7 +14,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>my_simulation_state</string> </value>
<value> <string>my_translated_simulation_state</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookUsualCashTransfer_viewCheckbookInputDialog.xml
View file @ 6e5b4306
......@@ -69,8 +69,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>filter_dict = {}\n
filter_dict[\'account_number_enabled\']=0\n
filter_dict[\'quantity_required\']=0\n
filter_dict[\'fixed_price\']=1\n
return context.Delivery_viewCheckbookInputDialog(item_portal_type_list=(\'Check\',),model_filter_dict=filter_dict,**kw)\n
</string> </value>
</item>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_viewCheckbookInputDialog.xml
View file @ 6e5b4306
......@@ -95,9 +95,12 @@ if listbox is None:\n
reference_date = DateTime()\n
item_list = []\n
listbox = []\n
if node is not None or disable_node:\n
getCurrentTrackingList = context.portal_simulation.getCurrentTrackingList\n
#context.log(\'current_tracking_list src\',getCurrentTrackingList(at_date=reference_date, node=node,src__=1,where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'"))\n
#return [x.path for x in getCurrentTrackingList(at_date=reference_date, node=node)]\n
if disable_node:\n
node=None\n
current_tracking_list = [x.getObject() for x in getCurrentTrackingList(\n
at_date=reference_date, node=node,\n
where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'")]\n
......@@ -116,6 +119,9 @@ if listbox is None:\n
if item_portal_type in item_portal_type_list:\n
if item_portal_type==\'Check\' and item.getSimulationState() not in (\'draft\',\'confirmed\'):\n
continue\n
if simulation_state is not None:\n
if item.getSimulationState()!=simulation_state:\n
continue\n
item_dict = {}\n
if item_portal_type==\'Check\':\n
item_dict[\'reference_range_max\'] = item.getReference()\n
......@@ -166,7 +172,7 @@ return context.asContext(context=None\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>listbox=None, item_portal_type_list=None,destination_payment=None,model_filter_dict=None,batch_mode=0,**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,**kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -186,7 +192,7 @@ return context.asContext(context=None\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>5</int> </value>
<value> <int>7</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -197,6 +203,8 @@ return context.asContext(context=None\n
<string>destination_payment</string>
<string>model_filter_dict</string>
<string>batch_mode</string>
<string>simulation_state</string>
<string>disable_node</string>
<string>kw</string>
<string>DateTime</string>
<string>Dummy</string>
......@@ -240,6 +248,8 @@ return context.asContext(context=None\n
<none/>
<none/>
<int>0</int>
<none/>
<int>0</int>
</tuple>
</value>
</item>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckPurchase_viewCheckbookInputDialog.xml
View file @ 6e5b4306
......@@ -68,8 +68,10 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>account = context.getDestinationPayment()\n
return context.Delivery_viewCheckbookInputDialog(destination_payment=account,**kw)\n
<value> <string>filter_dict = {}\n
filter_dict[\'fixed_price\']=1\n
kw[\'disable_node\'] = 1\n
return context.Delivery_viewCheckbookInputDialog(model_filter_dict=filter_dict,simulation_state=\'confirmed\',**kw)\n
</string> </value>
</item>
<item>
......@@ -125,10 +127,11 @@ return context.Delivery_viewCheckbookInputDialog(destination_payment=account,**k
<value>
<tuple>
<string>kw</string>
<string>filter_dict</string>
<string>_write_</string>
<string>_apply_</string>
<string>_getattr_</string>
<string>context</string>
<string>account</string>
<string>_apply_</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_viewCheckbookInputDialog.xml
View file @ 6e5b4306
......@@ -68,8 +68,9 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>account = context.getDestinationPayment()\n
return context.Delivery_viewCheckbookInputDialog(**kw)\n
<value> <string>filter_dict = {}\n
filter_dict[\'fixed_price\']=1\n
return context.Delivery_viewCheckbookInputDialog(model_filter_dict=filter_dict,**kw)\n
</string> </value>
</item>
<item>
......@@ -125,10 +126,11 @@ return context.Delivery_viewCheckbookInputDialog(**kw)\n
<value>
<tuple>
<string>kw</string>
<string>filter_dict</string>
<string>_write_</string>
<string>_apply_</string>
<string>_getattr_</string>
<string>context</string>
<string>account</string>
<string>_apply_</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml
View file @ 6e5b4306
......@@ -127,9 +127,10 @@ for line in line_list:\n
item.setDestinationPayment(line.getDestinationPayment())\n
item.setDestinationTrade(line.getDestinationTrade())\n
item.setResourceValue(resource)\n
if item.getPortalType()==\'Check\':\n
portal.portal_workflow.doActionFor(item,\'confirm_action\',\n
wf_id=\'check_workflow\')\n
# I (seb) think this is a big mistake\n
#if item.getPortalType()==\'Check\':\n
# portal.portal_workflow.doActionFor(item,\'confirm_action\',\n
# wf_id=\'check_workflow\')\n
aggregate_list.append(item)\n
\n
# Finally set the aggregate list on the line\n
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/transitions/confirm_action.xml
View file @ 6e5b4306
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
<value> <string>validateCheckbookVaultTransferConsistency</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/scripts/validatePositionAccounting.xml
View file @ 6e5b4306
......@@ -102,6 +102,9 @@ for movement in movement_list:\n
aggregate_value_list = movement.getAggregateValueList()\n
for item in aggregate_value_list:\n
if item.getPortalType()==\'Check\':\n
if item.getSimulationState()!=\'confirmed\':\n
msg = Message(domain = "ui", message="Sorry, one traveler check was not sale yet")\n
raise ValidationFailed, (msg,)\n
if item.getPrice() is not None:\n
# then we must calculate the exchange value at the\n
# time where the item was first delivered\n
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/scripts/validatePositionAccounting.xml
View file @ 6e5b4306
......@@ -119,6 +119,11 @@ if total_debit>0:\n
\n
line = transaction.movement\n
bank_account = transaction.getDestinationPaymentValue()\n
\n
if bank_account is None:\n
msg = Message(domain=\'ui\', message="Sorry, no account defined.")\n
raise ValidationFailed, (msg,)\n
\n
price = total_debit\n
\n
# this prevents multiple transactions from being committed at the same time for this bank account.\n
......
bt5/erp5_banking_check/bt/revision
View file @ 6e5b4306
46
\ No newline at end of file
48
\ No newline at end of file
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