[Erp5-report] r27052 - in /erp5/trunk/bt5/erp5_banking_cash: PortalTypeTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue May 19 15:10:39 CEST 2009
Author: aurel
Date: Tue May 19 15:10:26 2009
New Revision: 27052
URL: http://svn.erp5.org?rev=27052&view=rev
Log:
retrieve the site category from the vault before trying to get the country
Modified:
erp5/trunk/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Movement.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml
erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml
erp5/trunk/bt5/erp5_banking_cash/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Movement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%2520Movement.xml?rev=27052&r1=27051&r2=27052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Movement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Movement.xml [utf8] Tue May 19 15:10:26 2009
@@ -31,6 +31,25 @@
<key> <string>_owner</string> </key>
<value>
<none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_property_domain_dict</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>short_title</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
@@ -132,4 +151,44 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>domain_name</string> </key>
+ <value> <string>erp5_content</string> </value>
+ </item>
+ <item>
+ <key> <string>property_name</string> </key>
+ <value> <string>short_title</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>domain_name</string> </key>
+ <value> <string>erp5_content</string> </value>
+ </item>
+ <item>
+ <key> <string>property_name</string> </key>
+ <value> <string>title</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml?rev=27052&r1=27051&r2=27052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml [utf8] Tue May 19 15:10:26 2009
@@ -181,7 +181,7 @@
head_start_date_string = CD_file_line_list[7][35:43]\n
head_resource_string = CD_file_line_list[11][32:56]\n
head_emission_letter = CD_file_line_list[14][25:26]\n
- \n
+\n
# find letter in the emission_letter category\n
default_emissionLetter_list = [x[1] for x in context.portal_categories.emission_letter.getCategoryChildTitleItemList()[1:]]\n
head_emission_letter = string.lower(head_emission_letter)\n
Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml?rev=27052&r1=27051&r2=27052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml [utf8] Tue May 19 15:10:26 2009
@@ -122,7 +122,8 @@
if site in (None, ""):\n
msg = Message(domain="ui", message="You must select a foreign agency.")\n
raise ValidationFailed, (msg,)\n
- source_country = transaction.Baobab_getCountryForSite(transaction.getSource())\n
+ source_country_site = transaction.Baobab_getVaultSite(vault)\n
+ source_country = transaction.Baobab_getCountryForSite(source_country_site)\n
site_country = transaction.Baobab_getCountryForSite(site)\n
if \'encaisse_des_externes\' in vault and \\\n
site_country == source_country:\n
@@ -210,6 +211,7 @@
<string>_getiter_</string>
<string>line</string>
<string>site</string>
+ <string>source_country_site</string>
<string>source_country</string>
<string>site_country</string>
<string>amount</string>
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=27052&r1=27051&r2=27052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision [utf8] Tue May 19 15:10:26 2009
@@ -1,1 +1,1 @@
-656
+657
More information about the Erp5-report
mailing list