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

[nobody at svn.erp5.org]

Author: aurel
Date: Thu Oct 11 13:05:28 2007
New Revision: 16955

URL: http://svn.erp5.org?rev=16955&view=rev
Log:
forget to commit file in preivous one
display remaining operation once in

Modified:
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view.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/AccountingCancellationLine_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view.xml?rev=16955&r1=16954&r2=16955&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view.xml Thu Oct 11 13:05:28 2007
@@ -100,8 +100,8 @@
                       <list>
                         <string>my_source_payment_reference</string>
                         <string>my_source_payment_title</string>
-                        <string>my_source_credit</string>
-                        <string>my_source_debit</string>
+                        <string>my_destination_credit</string>
+                        <string>my_destination_debit</string>
                       </list>
                     </value>
                 </item>

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=16955&r1=16954&r2=16955&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 Thu Oct 11 13:05:28 2007
@@ -83,24 +83,25 @@
   for document in document_list:\n
     # Stop Payment and Cash Movement in started state must not block counter day closing.\n
     # Mutilated Banknotes in planned state or in finished state with siege as source must nogt block either.\n
-    portal_type = document.getPortalType()\n
-    simulation_state = document.getSimulationState()\n
-    if (portal_type in (\'Stop Payment\', ) and simulation_state == \'started\')  \\\n
-            or (portal_type == \'Mutilated Banknote\' and \n
-                 (simulation_state == \'planned\' or \n
-                   (simulation_state == \'finished\' and \'siege\' in here.getSource(\'\'))\n
-                 )\n
-               ) \\\n
-            or (portal_type == \'Monetary Destruction\' and simulation_state == \'ordered\'):\n
-       continue\n
-    if portal_type in (\'Cash Movement\', \'Cash Movement New Not Emmited\'):\n
-       if not (\n
-              ((simulation_state in (\'confirmed\') and site_url in document.getSource()) \n
-                or \n
-              (simulation_state in (\'stopped\') and site_url in document.getDestination()))\n
-           ):\n
-        continue\n
-    append(document)\n
+    if document not in operation_list:\n
+      portal_type = document.getPortalType()\n
+      simulation_state = document.getSimulationState()\n
+      if (portal_type in (\'Stop Payment\', ) and simulation_state == \'started\')  \\\n
+              or (portal_type == \'Mutilated Banknote\' and \n
+                   (simulation_state == \'planned\' or \n
+                     (simulation_state == \'finished\' and \'siege\' in here.getSource(\'\'))\n
+                   )\n
+                 ) \\\n
+              or (portal_type == \'Monetary Destruction\' and simulation_state == \'ordered\'):\n
+         continue\n
+      if portal_type in (\'Cash Movement\', \'Cash Movement New Not Emmited\'):\n
+         if not (\n
+                ((simulation_state in (\'confirmed\') and site_url in document.getSource()) \n
+                  or \n
+                (simulation_state in (\'stopped\') and site_url in document.getDestination()))\n
+             ):\n
+          continue\n
+      append(document)\n
 \n
 def operation_sort(a,b):\n
   result = cmp(a.getPortalType(),b.getPortalType())\n

Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=16955&r1=16954&r2=16955&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Thu Oct 11 13:05:28 2007
@@ -1,1 +1,1 @@
-368
+369