[Erp5-report] r10863 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Oct 20 16:43:06 CEST 2006


Author: jerome
Date: Fri Oct 20 16:43:04 2006
New Revision: 10863

URL: http://svn.erp5.org?rev=10863&view=rev
Log:
use getPortalPaymentNodeTypeList instead of hardcoding portal types.


Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationPaymentItemList.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourcePaymentItemList.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationPaymentItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationPaymentItemList.xml?rev=10863&r1=10862&r2=10863&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationPaymentItemList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationPaymentItemList.xml Fri Oct 20 16:43:04 2006
@@ -73,9 +73,10 @@
 \n
 item_list = [[\'\', \'\']]\n
 \n
-organisation = context.getDestinationSectionValue()\n
-if organisation is not None:\n
-  bank_account_list = organisation.contentValues(filter={\'portal_type\': [\'Bank Account\', \'Cash Register\', \'Credit Card\']})\n
+entity = context.getDestinationSectionValue()\n
+if entity is not None:\n
+  bank_account_list = entity.contentValues(filter={\'portal_type\':\n
+                 entity.getPortalPaymentNodeTypeList()})\n
   for bank_account in bank_account_list:\n
     url = bank_account.getRelativeUrl()\n
     #label = bank_account.getIban()\n
@@ -90,6 +91,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>
@@ -130,7 +137,7 @@
                             <string>item_list</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>organisation</string>
+                            <string>entity</string>
                             <string>None</string>
                             <string>bank_account_list</string>
                             <string>_getiter_</string>
@@ -164,4 +171,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_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourcePaymentItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourcePaymentItemList.xml?rev=10863&r1=10862&r2=10863&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourcePaymentItemList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourcePaymentItemList.xml Fri Oct 20 16:43:04 2006
@@ -73,9 +73,10 @@
 \n
 item_list = [[\'\', \'\']]\n
 \n
-organisation = context.getSourceSectionValue()\n
-if organisation is not None:\n
-  bank_account_list = organisation.contentValues(filter={\'portal_type\': [\'Bank Account\', \'Cash Register\', \'Credit Card\']})\n
+entity = context.getSourceSectionValue()\n
+if entity is not None:\n
+  bank_account_list = entity.contentValues(filter={\'portal_type\':\n
+                        entity.getPortalPaymentNodeTypeList()})\n
   for bank_account in bank_account_list:\n
     url = bank_account.getRelativeUrl()\n
     label = bank_account.getReference() or bank_account.getTitle()\n
@@ -89,6 +90,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>
@@ -129,7 +136,7 @@
                             <string>item_list</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>organisation</string>
+                            <string>entity</string>
                             <string>None</string>
                             <string>bank_account_list</string>
                             <string>_getiter_</string>
@@ -163,4 +170,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_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=10863&r1=10862&r2=10863&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Fri Oct 20 16:43:04 2006
@@ -1,1 +1,1 @@
-93
+94




More information about the Erp5-report mailing list