[Erp5-report] r10947 - in /erp5/trunk/bt5/erp5_banking_core: ModuleTemplateItem/ SkinTempla...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Oct 26 09:52:54 CEST 2006
Author: seb
Date: Thu Oct 26 09:52:37 2006
New Revision: 10947
URL: http://svn.erp5.org?rev=10947&view=rev
Log:
Aurélien fixed domains
Small changes in computing exchange values
new changes in ImportCsvToCategories
Modified:
erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/check_module.xml
erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_model_module.xml
erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_module.xml
erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/counter_date_module.xml
erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/counter_module.xml
erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/currency_cash_module.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankingOperationLine_view/my_source_payment_title.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_generateDestinationSiteDomainList.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_generateSourceSiteDomainList.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_viewOpenDialog/listbox.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_vault.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencySale_getQuantity.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getMovementList.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml
erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/cancelled.xml
erp5/trunk/bt5/erp5_banking_core/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/check_module.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/check_module.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/check_module.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/check_module.xml Thu Oct 26 09:52:37 2006
@@ -484,6 +484,9 @@
<name>Edit Factories</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Edit ParsedXML</name>
+ </permission>
<permission type='tuple'>
<name>Edit ReStructuredText</name>
<role>Manager</role>
@@ -685,6 +688,9 @@
<role>Auditor</role>
<role>Author</role>
<role>Manager</role>
+ </permission>
+ <permission type='list'>
+ <name>View DOM hierarchy</name>
</permission>
<permission type='tuple'>
<name>View History</name>
Modified: erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_model_module.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_model_module.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_model_module.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_model_module.xml Thu Oct 26 09:52:37 2006
@@ -486,6 +486,9 @@
<name>Edit Factories</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Edit ParsedXML</name>
+ </permission>
<permission type='tuple'>
<name>Edit ReStructuredText</name>
<role>Manager</role>
@@ -688,6 +691,9 @@
<role>Author</role>
<role>Manager</role>
<role>Member</role>
+ </permission>
+ <permission type='list'>
+ <name>View DOM hierarchy</name>
</permission>
<permission type='tuple'>
<name>View History</name>
Modified: erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_module.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_module.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_module.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_module.xml Thu Oct 26 09:52:37 2006
@@ -475,6 +475,9 @@
<name>Edit Factories</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Edit ParsedXML</name>
+ </permission>
<permission type='tuple'>
<name>Edit ReStructuredText</name>
<role>Manager</role>
@@ -673,6 +676,9 @@
<role>Auditor</role>
<role>Author</role>
<role>Manager</role>
+ </permission>
+ <permission type='list'>
+ <name>View DOM hierarchy</name>
</permission>
<permission type='tuple'>
<name>View History</name>
Modified: erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/counter_date_module.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/counter_date_module.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/counter_date_module.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/counter_date_module.xml Thu Oct 26 09:52:37 2006
@@ -484,6 +484,9 @@
<name>Edit Factories</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Edit ParsedXML</name>
+ </permission>
<permission type='tuple'>
<name>Edit ReStructuredText</name>
<role>Manager</role>
@@ -685,6 +688,9 @@
<role>Author</role>
<role>Manager</role>
<role>Member</role>
+ </permission>
+ <permission type='list'>
+ <name>View DOM hierarchy</name>
</permission>
<permission type='tuple'>
<name>View History</name>
Modified: erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/counter_module.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/counter_module.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/counter_module.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/counter_module.xml Thu Oct 26 09:52:37 2006
@@ -484,6 +484,9 @@
<name>Edit Factories</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Edit ParsedXML</name>
+ </permission>
<permission type='tuple'>
<name>Edit ReStructuredText</name>
<role>Manager</role>
@@ -685,6 +688,9 @@
<role>Author</role>
<role>Manager</role>
<role>Member</role>
+ </permission>
+ <permission type='list'>
+ <name>View DOM hierarchy</name>
</permission>
<permission type='tuple'>
<name>View History</name>
Modified: erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/currency_cash_module.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/currency_cash_module.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/currency_cash_module.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/currency_cash_module.xml Thu Oct 26 09:52:37 2006
@@ -484,6 +484,9 @@
<name>Edit Factories</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Edit ParsedXML</name>
+ </permission>
<permission type='tuple'>
<name>Edit ReStructuredText</name>
<role>Manager</role>
@@ -685,6 +688,9 @@
<role>Author</role>
<role>Manager</role>
<role>Member</role>
+ </permission>
+ <permission type='list'>
+ <name>View DOM hierarchy</name>
</permission>
<permission type='tuple'>
<name>View History</name>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankingOperationLine_view/my_source_payment_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankingOperationLine_view/my_source_payment_title.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankingOperationLine_view/my_source_payment_title.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankingOperationLine_view/my_source_payment_title.xml Thu Oct 26 09:52:37 2006
@@ -381,9 +381,7 @@
</item>
<item>
<key> <string>default</string> </key>
- <value>
- <list/>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_generateDestinationSiteDomainList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_generateDestinationSiteDomainList.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_generateDestinationSiteDomainList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_generateDestinationSiteDomainList.xml Thu Oct 26 09:52:37 2006
@@ -70,10 +70,9 @@
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
-from Products.ERP5Type.Document import newTempDomain\n
domain_list = []\n
i = 0\n
-vault_list = context.Delivery_getVaultItemList(leaf_node=0)\n
+vault_list = context.Delivery_getVaultItemList(leaf_node=0, vault_type="site")\n
\n
# get depth\n
depth = len(parent.getPath().split(\'/\')[3:])\n
@@ -81,9 +80,12 @@
for vault in vault_list:\n
if vault[0] != \'\':\n
if len(vault[0].split(\'/\')) == depth: \n
- if depth > 1 and vault[0].split(\'/\')[-2] != parent.getId():\n
- # only add those from parent\n
- continue\n
+ if depth > 1:\n
+ path_length = len(vault[0].split(\'/\')) - 1\n
+ parent_path = \'/\'.join(parent.getPath().split(\'/\')[-path_length:])\n
+ if \'/\'.join(vault[0].split(\'/\')[:-1]) != parent_path:\n
+ # only add those from parent\n
+ continue\n
domain = parent.generateTempDomain(id=vault[0].split(\'/\')[-1])\n
domain.edit(title=vault[0].split(\'/\')[-1], membership_criterion_base_category=(\'destination\',), membership_criterion_category=(\'destination/%s\' %(vault[1]),), domain_generator_method_id=script.id)\n
i+=1\n
@@ -98,6 +100,12 @@
<key> <string>_code</string> </key>
<value>
<none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_dav_writelocks</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
@@ -143,8 +151,6 @@
<string>depth</string>
<string>parent</string>
<string>kw</string>
- <string>Products.ERP5Type.Document</string>
- <string>newTempDomain</string>
<string>domain_list</string>
<string>i</string>
<string>_getattr_</string>
@@ -154,6 +160,8 @@
<string>_getitem_</string>
<string>_getiter_</string>
<string>vault</string>
+ <string>path_length</string>
+ <string>parent_path</string>
<string>domain</string>
<string>script</string>
</tuple>
@@ -183,4 +191,25 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Persistence</string>
+ <string>PersistentMapping</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_container</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_generateSourceSiteDomainList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_generateSourceSiteDomainList.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_generateSourceSiteDomainList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_generateSourceSiteDomainList.xml Thu Oct 26 09:52:37 2006
@@ -70,21 +70,22 @@
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
-from Products.ERP5Type.Document import newTempDomain\n
domain_list = []\n
i = 0\n
-vault_list = context.Delivery_getVaultItemList(leaf_node=0)\n
+vault_list = context.Delivery_getVaultItemList(leaf_node=0, vault_type=\'site\')\n
\n
# get depth\n
depth = len(parent.getPath().split(\'/\')[3:])\n
\n
for vault in vault_list:\n
if vault[0] != \'\':\n
- context.log("vault[0]", vault[0])\n
- if len(vault[0].split(\'/\')) == depth: \n
- if depth > 1 and vault[0].split(\'/\')[-2] != parent.getId():\n
- # only add those from parent\n
- continue\n
+ if len(vault[0].split(\'/\')) == depth:\n
+ if depth > 1:\n
+ path_length = len(vault[0].split(\'/\')) - 1\n
+ parent_path = \'/\'.join(parent.getPath().split(\'/\')[-path_length:])\n
+ if \'/\'.join(vault[0].split(\'/\')[:-1]) != parent_path:\n
+ # only add those from parent\n
+ continue\n
domain = parent.generateTempDomain(id=vault[0].split(\'/\')[-1])\n
domain.edit(title=vault[0].split(\'/\')[-1], membership_criterion_base_category=(\'source\',), membership_criterion_category=(\'source/%s\' %(vault[1]),), domain_generator_method_id=script.id)\n
i+=1\n
@@ -99,6 +100,12 @@
<key> <string>_code</string> </key>
<value>
<none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_dav_writelocks</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
@@ -144,8 +151,6 @@
<string>depth</string>
<string>parent</string>
<string>kw</string>
- <string>Products.ERP5Type.Document</string>
- <string>newTempDomain</string>
<string>domain_list</string>
<string>i</string>
<string>_getattr_</string>
@@ -155,6 +160,8 @@
<string>_getitem_</string>
<string>_getiter_</string>
<string>vault</string>
+ <string>path_length</string>
+ <string>parent_path</string>
<string>domain</string>
<string>script</string>
</tuple>
@@ -184,4 +191,25 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Persistence</string>
+ <string>PersistentMapping</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_container</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml Thu Oct 26 09:52:37 2006
@@ -75,7 +75,7 @@
\n
dest_site_title = context.getDestinationValue().getSiteTitle()\n
\n
-site_list = context.Delivery_getVaultItemList(user_site=0, vault_type=("site", "site/surface/banque_interne/guichet", "site/surface/gros_paiement/guichet", "site/surface/gros_versement/guichet"), strict_membership=1, leaf_node=0, base_site=context.getDestinationValue().getSite())\n
+site_list = context.Delivery_getVaultItemList(user_site=0, vault_type=("site", "site/surface/banque_interne/guichet", "site/surface/gros_paiement/guichet", "site/surface/gros_versement/guichet", "site/surface/operations_diverses/guichet"), strict_membership=1, leaf_node=0, base_site=context.getDestinationValue().getSite())\n
# now must filter again this list to remove useless categories\n
site_dict = {}\n
for site in site_list:\n
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_viewOpenDialog/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_viewOpenDialog/listbox.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_viewOpenDialog/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_viewOpenDialog/listbox.xml Thu Oct 26 09:52:37 2006
@@ -438,6 +438,10 @@
</value>
</item>
<item>
+ <key> <string>page_template</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>portal_types</string> </key>
<value>
<list/>
@@ -500,7 +504,16 @@
<item>
<key> <string>url_columns</string> </key>
<value>
- <list/>
+ <list>
+ <tuple>
+ <string>name</string>
+<string></string>
+ </tuple>
+ <tuple>
+ <string>path</string>
+<string></string>
+ </tuple>
+ </list>
</value>
</item>
</dictionary>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_vault.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_vault.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_vault.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_vault.xml Thu Oct 26 09:52:37 2006
@@ -296,7 +296,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.Delivery_getVaultItemList(vault_type=\'site\', all=1)</string> </value>
+ <value> <string>python: here.Delivery_getVaultItemList(vault_type=\'site\', all=1,leaf_node=0)</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml Thu Oct 26 09:52:37 2006
@@ -73,19 +73,21 @@
commission_ratio = context.getDiscountRatio()\n
commission_price = context.getDiscount()\n
if commission_ratio is not None and commission_ratio !=0 and commission_price is not None and commission_price !=0:\n
- return None\n
+ price = None\n
if commission_ratio == 0 or commission_price == 0:\n
price = round(price,0)\n
- return price\n
if commission_ratio is None and commission_price is None:\n
price = round(price,0)\n
- return price\n
-\n
+\n
+comission_value = 0\n
if commission_ratio is not None:\n
commission_value = commission_ratio * price\n
\n
if commission_price is not None:\n
commission_value = commission_price\n
+\n
+if price is None:\n
+ return price\n
\n
quantity = price - commission_value\n
quantity = round(quantity,0)\n
@@ -153,6 +155,7 @@
<string>commission_price</string>
<string>None</string>
<string>round</string>
+ <string>comission_value</string>
<string>commission_value</string>
<string>quantity</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencySale_getQuantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencySale_getQuantity.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencySale_getQuantity.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencySale_getQuantity.xml Thu Oct 26 09:52:37 2006
@@ -73,19 +73,21 @@
commission_ratio = context.getDiscountRatio()\n
commission_price = context.getDiscount()\n
if commission_ratio is not None and commission_ratio !=0 and commission_price is not None and commission_price !=0:\n
- return None\n
-if commission_ratio == 0 or commission_price == 0:\n
+ price = None\n
+elif commission_ratio == 0 or commission_price == 0:\n
price = round(price,0)\n
- return price\n
-if commission_ratio is None and commission_price is None:\n
+elif commission_ratio is None and commission_price is None:\n
price = round(price,0)\n
- return price\n
-\n
+\n
+commission_value = 0\n
if commission_ratio is not None:\n
commission_value = commission_ratio * price\n
\n
if commission_price is not None:\n
commission_value = commission_price\n
+\n
+if price is None:\n
+ return price\n
\n
quantity = price + commission_value\n
quantity = round(quantity,0)\n
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getMovementList.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getMovementList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getMovementList.xml Thu Oct 26 09:52:37 2006
@@ -68,15 +68,14 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-# return context.getMovementList(portal_type=portal_type)\n
+ <value> <string># return context.getMovementList(portal_type=portal_type)\n
# here we suppose we have only two level of portal type\n
#context.log("Delivery_getMovementList", "portal_type = %s" %(portal_type,))\n
+#context.log("Delivery_getMovementList", "len portal_type = %s" % (len(portal_type),))\n
\n
if not same_type(portal_type, []):\n
return context.getMovementList(portal_type=portal_type)\n
-if len(portal_type) > 2 or len(portal_type) == 0:\n
+if len(portal_type) != 2:\n
# use catalog\n
return context.getMovementList(portal_type=portal_type)\n
\n
@@ -99,9 +98,7 @@
cell_list.extend(list(line.objectValues(portal_type=cell_type)))\n
\n
return cell_list\n
-
-
-]]></string> </value>
+</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml Thu Oct 26 09:52:37 2006
@@ -180,6 +180,7 @@
if len(e_list) == 2 :\n
try :\n
print \'trying to assign to %s ...\' % lowerCase(e_list[0]) ,\n
+ context.log(\'lowerCase(e_list[0])\',lowerCase(e_list[0]))\n
category = context.portal_categories.getCategoryValue(lowerCase(e_list[0]))\n
category.setCodification(e_list[1])\n
# Automatically assign code for some subcategories\n
@@ -258,7 +259,9 @@
if counter_name in two_way_counter_list:\n
subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, "entrante"), None])\n
subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, "sortante"), None])\n
- if subvault == \'Encaisse des Devises\' :\n
+ elif subvault == \'Encaisse des Externes\' :\n
+ subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, "transit"), \'TRA\'])\n
+ elif subvault == \'Encaisse des Devises\' :\n
for c in context.currency_module.objectValues() :\n
if c.getId() != context.Baobab_getPortalReferenceCurrencyID():\n
if counter_name in two_way_counter_list:\n
@@ -268,7 +271,7 @@
else:\n
#context.log(\'add encaisse des billets et monnaies\',counter_subvault)\n
subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, c.getTitle()), None])\n
- if subvault in (\'Encaisse des Billets Recus pour Ventilation Venant de\',\'Encaisse des Billets en Transit Allant a\',\n
+ elif subvault in (\'Encaisse des Billets Recus pour Ventilation Venant de\',\'Encaisse des Billets en Transit Allant a\',\n
\'Encaisse des Billets Neufs Non Emis en Transit Allant a\') :\n
for c in context.portal_categories.site.agence.principale.objectIds() :\n
if counter_name in two_way_counter_list:\n
@@ -292,6 +295,8 @@
# parse the for site category tree and add sub categories if required\n
#for c in context.portal_categories.site.getCategoryChildValueList() :\n
#for c in context.portal_categories.site.agence.principale.lome.getCategoryChildValueList() :\n
+ #for c in context.portal_categories.site.getCategoryChildValueList() :\n
+ #for c in context.portal_categories.site.agence.principale.cotonou.getCategoryChildValueList() :\n
for c in context.portal_categories.site.getCategoryChildValueList() :\n
context.log(\'c.getPath()\',c.getPath())\n
for vault_type in vault_type_list :\n
@@ -325,6 +330,16 @@
subcat_vault_type = \'%s/guichet\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n
elif \'retire\' in subvault_path.lower():\n
subcat_vault_type = \'%s/retire\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n
+ elif subvault_path.lower().endswith(\'externes\'):\n
+ subcat_vault_type = \'%s/encaisse_des_externes\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n
+ elif subvault_path.lower().endswith(\'transit\'):\n
+ subcat_vault_type = \'%s/encaisse_des_externes/transit\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n
+ elif \'devises\' in subvault_path.lower():\n
+ subcat_vault_type = \'%s/encaisse_des_devises\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n
+ elif \'mutiles\' in subvault_path.lower():\n
+ subcat_vault_type = \'%s/billets_mutiles\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n
+ elif \'macules\' in subvault_path.lower():\n
+ subcat_vault_type = \'%s/billets_macules\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n
else:\n
subcat_vault_type = \'/\'.join(vault_type.split(\'/\')[1:])\n
new_category_obj = create_category(cat = \'%s/%s\' % (c.getRelativeUrl(), subvault_path), vault_type = subcat_vault_type)\n
Modified: erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/cancelled.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/cancelled.xml?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/cancelled.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/cancelled.xml Thu Oct 26 09:52:37 2006
@@ -40,7 +40,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Stopped (Check)</string> </value>
+ <value> <string>Cancelled (Check)</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=10947&r1=10946&r2=10947&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Thu Oct 26 09:52:37 2006
@@ -1,1 +1,1 @@
-29
+42
More information about the Erp5-report
mailing list