[Erp5-report] r16535 - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: aurel
Date: Fri Sep 21 14:31:59 2007
New Revision: 16535

URL: http://svn.erp5.org?rev=16535&view=rev
Log:
sometime, only site is defined on document, so also retrieve these operations when listing remaining one
add new simulation state to be taken into account for remaining operations

Modified:
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList.xml
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml
    erp5/trunk/bt5/erp5_banking_core/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList.xml?rev=16535&r1=16534&r2=16535&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList.xml Fri Sep 21 14:31:59 2007
@@ -71,15 +71,19 @@
   simulation_state = [\'confirmed\']\n
 kwd_source = {\'default_source_uid\' : site_uid,\'simulation_state\' : simulation_state}\n
 kwd_destination = {\'default_destination_uid\' : site_uid,\'simulation_state\' : simulation_state}\n
+kwd_site = {\'default_site_uid\' : site_uid,\'simulation_state\' : simulation_state}\n
 if date is not None:\n
   kwd_source[\'delivery.start_date\']=date\n
   kwd_destination[\'delivery.start_date\']=date\n
+  kwd_site[\'delivery.start_date\']=date\n
 if portal_type is not None:\n
   kwd_source[\'portal_type\'] = portal_type\n
   kwd_destination[\'portal_type\'] = portal_type\n
+  kwd_site[\'portal_type\'] = portal_type\n
 # as destination\n
 operation_list = list(context.portal_catalog(**kwd_source)) + \\\n
-                      list(context.portal_catalog(**kwd_destination))\n
+                 list(context.portal_catalog(**kwd_destination)) + \\\n
+                      list(context.portal_catalog(**kwd_site))\n
 operation_list_object = [x.getObject() for x in operation_list]\n
 \n
 return operation_list_object\n
@@ -138,6 +142,7 @@
                             <string>None</string>
                             <string>kwd_source</string>
                             <string>kwd_destination</string>
+                            <string>kwd_site</string>
                             <string>_write_</string>
                             <string>list</string>
                             <string>_apply_</string>

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml?rev=16535&r1=16534&r2=16535&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml Fri Sep 21 14:31:59 2007
@@ -72,7 +72,7 @@
 operation_list = []\n
 exception_portal_type_list = [\'Paper Money Deposit\']\n
 if site_uid is not None:\n
-  not_closed_state_list = (\'ordered\',\'planned\',\'confirmed\',\'started\',\'stopped\')\n
+  not_closed_state_list = (\'ordered\',\'planned\',\'confirmed\',\'started\',\'stopped\', \'ready\', \'deposited\', \'received\')\n
   portal_type_list = [x for x in context.getPortalDeliveryTypeList()\n
                       if x not in exception_portal_type_list]\n
   document_list = context.Baobab_getRemainingOperationList(\n

Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=16535&r1=16534&r2=16535&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Fri Sep 21 14:31:59 2007
@@ -1,1 +1,1 @@
-357
+358