[Erp5-report] r16622 - in /erp5/trunk/bt5/erp5_banking_check: ExtensionTemplateItem/ SkinTe...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Sep 26 12:06:59 CEST 2007
Author: seb
Date: Wed Sep 26 12:06:59 2007
New Revision: 16622
URL: http://svn.erp5.org?rev=16622&view=rev
Log:
fixed worklist on check deposit
Added:
erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/worklists/planned.xml
Modified:
erp5/trunk/bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py
erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml
erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_checkOrCreateItemList.xml
erp5/trunk/bt5/erp5_banking_check/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py?rev=16622&r1=16621&r2=16622&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py (original)
+++ erp5/trunk/bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py Wed Sep 26 12:06:59 2007
@@ -6,6 +6,7 @@
reference_dict = {}
reference_dict['CHEQUIER_COMPTE_COURANT_ORDINAIRE'] = 'CHCCO'
reference_dict['CHEQUIER_COMPTE_ORDINAIRE_DU_PERSONNEL'] = 'CHCOP'
+ reference_dict['CARNET_BON_VIREMENT'] = 'CABV'
reference_dict['BON_VIREMENT'] = 'BV'
# We will build a several listbox like it is already done into the user interface
# A listbox will be build for every resource
@@ -13,6 +14,7 @@
file_item_list = xml_content.xpath('//object')
# First, construct a dictionnary for every resource
import_dict = {}
+ self.log("import checkbook", "file_item_list = %s" %(file_item_list,))
for item in file_item_list:
checkbook_id = item.xpath("string(@id)")
check_quantity = str(item.xpath("string(./check_quantity)"))
@@ -31,9 +33,10 @@
item_dict['check_quantity'] = check_quantity
item_dict['quantity'] = quantity
item_dict['internal_account_number'] = internal_account_number
-
+ #self.log("import checkbook", "item_dict = %s" %(item_dict,))
listbox_dict = {}
for (checkbook_type, checkbook_dict) in import_dict.items():
+ self.log("checkbook_type %s, checkbook_dict %s" %(checkbook_type, checkbook_dict), "")
listbox = []
i = 0
resource_list = self.portal_catalog(portal_type=['Checkbook Model',
@@ -54,6 +57,7 @@
amount.getRelativeUrl()
for (account, account_dict) in checkbook_dict.items():
for (gid, item_dict) in account_dict.items():
+ self.log("is checkbook ? %s" %is_checkbook, "will fill value %s" %(item_dict,))
listbox_line = {}
listbox_line['listbox_key'] = '%05i' % i
listbox_line['reference_range_min'] = item_dict['reference_min']
Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml?rev=16622&r1=16621&r2=16622&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml Wed Sep 26 12:06:59 2007
@@ -186,6 +186,10 @@
(reference_range_max - reference_range_min + 1 != check_quantity * quantity\n
or\n
reference_range_max < reference_range_min):\n
+ context.log("Range is not valid",\n
+ "range max %s, range min %s, check quantity %s, quanityt %s" %(reference_range_max,\n
+ reference_range_min,\n
+ check_quantity, quantity))\n
message = \'The range is not valid\'\n
generate_error(line,\'reference_range_min\',message)\n
generate_error(line,\'reference_range_max\',message)\n
Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_checkOrCreateItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_checkOrCreateItemList.xml?rev=16622&r1=16621&r2=16622&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_checkOrCreateItemList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_checkOrCreateItemList.xml Wed Sep 26 12:06:59 2007
@@ -96,7 +96,7 @@
\n
if create==1:\n
for line in line_list:\n
- line.activate(tag=checkbook_reception_tag).\\\n
+ line.activate(priority=4, tag=checkbook_reception_tag).\\\n
CheckbookReceptionLine_checkOrCreateItemList(create=1, tag=checkbook_reception_tag, confirm_check=confirm_check)\n
</string> </value>
</item>
Added: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/worklists/planned.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/worklists/planned.xml?rev=16622&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/worklists/planned.xml (added)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/worklists/planned.xml Wed Sep 26 12:06:59 2007
@@ -1,0 +1,119 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>actbox_category</string> </key>
+ <value> <string>global</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_name</string> </key>
+ <value> <string>Waiting for second validation (%(count)s)</string> </value>
+ </item>
+ <item>
+ <key> <string>actbox_url</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+Base_viewWorklist?simulation_state=planned&portal_type=Check Deposit&reset=1
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>Waiting for second validation</string> </value>
+ </item>
+ <item>
+ <key> <string>guard</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>planned</string> </value>
+ </item>
+ <item>
+ <key> <string>var_matches</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>roles</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ <string>Assignee</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value>
+ <tuple>
+ <string>Check Deposit</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>simulation_state</string> </key>
+ <value>
+ <tuple>
+ <string>planned</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=16622&r1=16621&r2=16622&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Wed Sep 26 12:06:59 2007
@@ -1,1 +1,1 @@
-325
+326
More information about the Erp5-report
mailing list