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 6f0fa9e968ee47dbf5d334c397599599b92e9503..14c990390164ea4568625077c417447aedad93e2 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 20f004c3c04085024d32c3f74f4f0a4902632b3a..55c3516ba50665b676a0a4525bcaf5381832b788 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 25417dad5587609021599a8b8631c25059c0065c..8c19d14d40779bd8ae1e74d19dc262579ea0d10b 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