From 29f754ed4a24f3d5ba32ee2846bc659ddfd5b0af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com>
Date: Thu, 11 Oct 2007 11:05:28 +0000
Subject: [PATCH] forget to commit file in preivous one display remaining
 operation once in

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16955 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../AccountingCancellationLine_view.xml       |  4 +-
 .../CounterDate_getRemainingOperationList.xml | 37 ++++++++++---------
 bt5/erp5_banking_core/bt/revision             |  2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view.xml
index 6f0fa9e968..14c9903901 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingCancellationLine_view.xml
@@ -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>
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml
index 20f004c3c0..55c3516ba5 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml
@@ -83,24 +83,25 @@ if site_uid is not None:\n
   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
diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision
index 25417dad55..8c19d14d40 100644
--- a/bt5/erp5_banking_core/bt/revision
+++ b/bt5/erp5_banking_core/bt/revision
@@ -1 +1 @@
-368
\ No newline at end of file
+369
\ No newline at end of file
-- 
2.30.9