[Erp5-report] r13284 - in /erp5/trunk/bt5/erp5_accounting_l10n_fr_m9: SkinTemplateItem/port...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Mar  8 12:56:17 2007
New Revision: 13284

URL: http://svn.erp5.org?rev=13284&view=rev
Log:
transaction.getSourcePaymentValue(portal_type='External Payment') will use
acquisition, so we simply call getSourcePaymentValue() and check the portal
type of this value.
Also, if no title is set for an external payment, use the third party title.


Modified:
    erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PaymentTransaction_getMirrorExternalPaymentOrMirrorSectionTitle.xml
    erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PaymentTransaction_getMirrorExternalPaymentOrMirrorSectionTitle.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PaymentTransaction_getMirrorExternalPaymentOrMirrorSectionTitle.xml?rev=13284&r1=13283&r2=13284&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PaymentTransaction_getMirrorExternalPaymentOrMirrorSectionTitle.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PaymentTransaction_getMirrorExternalPaymentOrMirrorSectionTitle.xml Thu Mar  8 12:56:17 2007
@@ -86,14 +86,18 @@
 \n
 source_section = transaction.getSourceSectionValue()\n
 if source_section is not None and source_section.isMemberOf(section_category):\n
-  external_payment = transaction.getDestinationPaymentValue(portal_type=\'External Payment\')\n
-  if external_payment is not None:\n
-    return external_payment.getShortTitle() or external_payment.getTitle()\n
+  external_payment = transaction.getDestinationPaymentValue()\n
+  if external_payment is not None and \\\n
+              external_payment.getPortalType() == \'External Payment\':\n
+    return external_payment.getShortTitle() or external_payment.getTitle()\\\n
+               or transaction.getDestinationSectionTitle()\n
   return transaction.getDestinationSectionTitle()\n
 \n
-external_payment = transaction.getSourcePaymentValue(portal_type=\'External Payment\')\n
-if external_payment is not None:\n
-  return external_payment.getShortTitle() or external_payment.getTitle()\n
+external_payment = transaction.getSourcePaymentValue()\n
+if external_payment is not None and \\\n
+            external_payment.getPortalType() == \'External Payment\':\n
+  return external_payment.getShortTitle() or external_payment.getTitle()\\\n
+               or transaction.getSourceSectionTitle()\n
 return transaction.getSourceSectionTitle()\n
 </string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision?rev=13284&r1=13283&r2=13284&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision Thu Mar  8 12:56:17 2007
@@ -1,1 +1,1 @@
-84
+85