[Erp5-report] r19052 - in /erp5/trunk/bt5/erp5_accounting: CatalogRelatedKeyTemplateItem/ S...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 5 14:52:40 CET 2008
Author: yusei
Date: Tue Feb 5 14:52:39 2008
New Revision: 19052
URL: http://svn.erp5.org?rev=19052&view=rev
Log:
2008-2-5 yusei
* Fixed third party column issue and optimize the query.
Modified:
erp5/trunk/bt5/erp5_accounting/CatalogRelatedKeyTemplateItem/related_key_list.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyTitle.xml
erp5/trunk/bt5/erp5_accounting/bt/change_log
erp5/trunk/bt5/erp5_accounting/bt/revision
erp5/trunk/bt5/erp5_accounting/bt/template_catalog_method_id_list
erp5/trunk/bt5/erp5_accounting/bt/template_catalog_related_key_list
Modified: erp5/trunk/bt5/erp5_accounting/CatalogRelatedKeyTemplateItem/related_key_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/CatalogRelatedKeyTemplateItem/related_key_list.xml?rev=19052&r1=19051&r2=19052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/CatalogRelatedKeyTemplateItem/related_key_list.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/CatalogRelatedKeyTemplateItem/related_key_list.xml Tue Feb 5 14:52:39 2008
@@ -1,5 +1,4 @@
<key_list>
- <key>delivery_mirror_section_title | delivery,catalog/title/z_delivery_related_mirror_section</key>
<key>preferred_gap_id | category,catalog/id/z_related_preferred_gap</key>
<key>preferred_gap_strict_membership_id | category,catalog/id/z_related_strict_membership_preferred_gap</key>
</key_list>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml?rev=19052&r1=19051&r2=19052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml Tue Feb 5 14:52:39 2008
@@ -105,7 +105,7 @@
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>all_columns</string> </key>
+ <key> <string>all_columns</string> </key>
<value>
<list>
<tuple>
@@ -174,7 +174,7 @@
</value>
</item>
<item>
- <key> <string>columns</string> </key>
+ <key> <string>columns</string> </key>
<value>
<list>
<tuple>
@@ -217,19 +217,19 @@
</value>
</item>
<item>
- <key> <string>count_method</string> </key>
+ <key> <string>count_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
- <key> <string>default_params</string> </key>
+ <key> <string>default_params</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>editable_columns</string> </key>
+ <key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
@@ -276,7 +276,7 @@
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>list_method</string> </key>
+ <key> <string>list_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
@@ -286,7 +286,7 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>portal_types</string> </key>
+ <key> <string>portal_types</string> </key>
<value>
<list>
<tuple>
@@ -321,7 +321,7 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>search_columns</string> </key>
+ <key> <string>search_columns</string> </key>
<value>
<list>
<tuple>
@@ -360,22 +360,22 @@
</value>
</item>
<item>
- <key> <string>selection_name</string> </key>
+ <key> <string>selection_name</string> </key>
<value> <string>accounting_selection</string> </value>
</item>
<item>
- <key> <string>sort</string> </key>
- <value>
- <list>
- <tuple>
- <string>operation_date</string>
- <string>operation_date</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
- <key> <string>sort_columns</string> </key>
+ <key> <string>sort</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>operation_date</string>
+ <string>operation_date</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>sort_columns</string> </key>
<value>
<list>
<tuple>
@@ -414,7 +414,7 @@
</value>
</item>
<item>
- <key> <string>stat_columns</string> </key>
+ <key> <string>stat_columns</string> </key>
<value>
<list>
<tuple>
@@ -429,7 +429,7 @@
</value>
</item>
<item>
- <key> <string>stat_method</string> </key>
+ <key> <string>stat_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value>
@@ -439,11 +439,11 @@
<value> <string>Click to edit the target</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value> <string>Accounting Transactions</string> </value>
</item>
<item>
- <key> <string>url_columns</string> </key>
+ <key> <string>url_columns</string> </key>
<value>
<list>
<tuple>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title.xml?rev=19052&r1=19051&r2=19052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title.xml Tue Feb 5 14:52:39 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
- </tuple>
- <none/>
+ <global name="StringField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -268,18 +265,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>cell/AccountingTransaction_getThirdPartyTitle</string> </value>
+ <value> <string>cell/delivery_mirror_section_title|cell/AccountingTransaction_getThirdPartyTitle</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml?rev=19052&r1=19051&r2=19052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml Tue Feb 5 14:52:39 2008
@@ -300,32 +300,32 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>selection</string>
- <string>selection_name</string>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>selection_params</string>
- <string>select_expression</string>
- <string>from_date</string>
- <string>at_date</string>
- <string>to_date</string>
- <string>node</string>
- <string>resource</string>
- <string>entity</string>
- <string>stat</string>
- <string>omit_input</string>
- <string>omit_output</string>
- <string>amount</string>
- <string>amount_range_min</string>
- <string>amount_range_max</string>
- <string>creation_date_range_min</string>
- <string>creation_date_range_max</string>
- <string>section_category</string>
- <string>count</string>
- <string>transaction_uid</string>
- <string>specific_reference</string>
- <string>no_limit</string>
- <string>search_result_keys</string>
+<string>selection</string>
+<string>selection_name</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>selection_params</string>
+<string>select_expression</string>
+<string>from_date</string>
+<string>at_date</string>
+<string>to_date</string>
+<string>node</string>
+<string>resource</string>
+<string>entity</string>
+<string>stat</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>amount</string>
+<string>amount_range_min</string>
+<string>amount_range_max</string>
+<string>creation_date_range_min</string>
+<string>creation_date_range_max</string>
+<string>section_category</string>
+<string>count</string>
+<string>transaction_uid</string>
+<string>specific_reference</string>
+<string>no_limit</string>
+<string>search_result_keys</string>
</list>
</value>
</item>
@@ -407,7 +407,7 @@
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), **selection_params)">\n
+<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), select_expression_key=(\'operation_date\', \'specific_reference\', \'delivery_mirror_section_title\',), **selection_params)">\n
<dtml-let search_result_keys="search_result_keys or portal_catalog.getCatalogSearchResultKeys()">\n
<dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max">\n
\n
@@ -598,10 +598,10 @@
<dtml-if stat>\n
SELECT SUM(total_price) AS total_price FROM (\n
SELECT DISTINCT total_price, uid FROM (\n
- </dtml-if>\n
-\n
- <dtml-if count>\n
+ <dtml-elif count>\n
SELECT COUNT(DISTINCT uid) AS count FROM (\n
+ <dtml-else>\n
+ SELECT * from (\n
</dtml-if>\n
\n
\n
@@ -625,9 +625,16 @@
<dtml-unless sequence-start>,</dtml-unless>\n
<dtml-var sequence-item>\n
</dtml-in>\n
+ , delivery.start_date as operation_date\n
+ , catalog.source_reference as specific_reference\n
<dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
- ,<dtml-var "query[\'order_by_expression\'].split(\' \')[0]">\n
- </dtml-if>\n
+ <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n
+ <dtml-if "not order_column in (\'operation_date\', \'specific_reference\')">\n
+ ,<dtml-var "query[\'order_by_expression\'].split(\' \')[0]">\n
+ </dtml-if>\n
+ </dtml-let>\n
+ </dtml-if>\n
+ <dtml-if delivery_mirror_section_title>, mirror_section_catalog.title as delivery_mirror_section_title</dtml-if>\n
<dtml-if select_expression><dtml-var select_expression> </dtml-if>\n
</dtml-if>\n
\n
@@ -647,6 +654,7 @@
<dtml-if "stat or omit_input or omit_output or node">\n
stock, catalog as child, </dtml-if>\n
<dtml-if "section_category">category, catalog as section, </dtml-if>\n
+ <dtml-if "delivery_mirror_section_title">delivery AS mirror_section_delivery, catalog AS mirror_section_catalog,</dtml-if>\n
catalog,\n
delivery\n
\n
@@ -696,6 +704,11 @@
AND section.uid = category.uid\n
AND category.category_uid =\n
<dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
+ </dtml-if>\n
+ <dtml-if "delivery_mirror_section_title">\n
+ AND mirror_section_catalog.uid = mirror_section_delivery.destination_section_uid\n
+ AND mirror_section_delivery.uid = catalog.uid\n
+ AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n
</dtml-if>\n
\n
<dtml-comment>\n
@@ -790,10 +803,16 @@
<dtml-unless sequence-start>,</dtml-unless>\n
<dtml-var sequence-item>\n
</dtml-in>\n
+ , delivery.stop_date as operation_date\n
+ , catalog.destination_reference as specific_reference\n
<dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
- ,<dtml-var "query[\'order_by_expression\'].split(\' \')[0]">\n
- </dtml-if>\n
-\n
+ <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n
+ <dtml-if "not order_column in (\'operation_date\', \'specific_reference\')">\n
+ ,<dtml-var "query[\'order_by_expression\'].split(\' \')[0]">\n
+ </dtml-if>\n
+ </dtml-let>\n
+ </dtml-if>\n
+ <dtml-if delivery_mirror_section_title>, mirror_section_catalog.title as delivery_mirror_section_title</dtml-if>\n
<dtml-if select_expression><dtml-var select_expression> </dtml-if>\n
</dtml-if>\n
\n
@@ -813,6 +832,7 @@
<dtml-if "stat or omit_input or omit_output or node">\n
stock, catalog as child, </dtml-if>\n
<dtml-if "section_category">category, catalog as section, </dtml-if>\n
+ <dtml-if "delivery_mirror_section_title">delivery AS mirror_section_delivery, catalog AS mirror_section_catalog,</dtml-if>\n
catalog,\n
delivery\n
\n
@@ -863,7 +883,12 @@
AND category.category_uid =\n
<dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
</dtml-if>\n
- \n
+ <dtml-if "delivery_mirror_section_title">\n
+ AND mirror_section_catalog.uid = mirror_section_delivery.source_section_uid\n
+ AND mirror_section_delivery.uid = catalog.uid\n
+ AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n
+ </dtml-if>\n
+\n
<dtml-comment>\n
-- FIXME: we want stop date when we are destination_section and start_date when\n
-- we are source_section (one solution is to read in stock.date, but we try\n
@@ -941,14 +966,15 @@
\n
<dtml-if "count">\n
) as catalog\n
- </dtml-if>\n
-\n
- <dtml-if "stat">\n
+ <dtml-elif "stat">\n
) as sb\n
) as catalog\n
+ <dtml-else>\n
+ ) as catalog\n
</dtml-if>\n
\n
<dtml-if "not (stat or count)">\n
+ GROUP BY uid\n
<dtml-if "query[\'order_by_expression\']">\n
ORDER BY <dtml-var "query[\'order_by_expression\'].split(\'.\')[-1]">\n
</dtml-if>\n
@@ -1007,7 +1033,7 @@
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), **selection_params)">\n
+<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), select_expression_key=(\'operation_date\', \'specific_reference\', \'delivery_mirror_section_title\',), **selection_params)">\n
<dtml-let search_result_keys="search_result_keys or portal_catalog.getCatalogSearchResultKeys()">\n
<dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max">\n
\n
@@ -1198,10 +1224,10 @@
<dtml-if stat>\n
SELECT SUM(total_price) AS total_price FROM (\n
SELECT DISTINCT total_price, uid FROM (\n
- </dtml-if>\n
-\n
- <dtml-if count>\n
+ <dtml-elif count>\n
SELECT COUNT(DISTINCT uid) AS count FROM (\n
+ <dtml-else>\n
+ SELECT * from (\n
</dtml-if>\n
\n
\n
@@ -1225,9 +1251,16 @@
<dtml-unless sequence-start>,</dtml-unless>\n
<dtml-var sequence-item>\n
</dtml-in>\n
+ , delivery.start_date as operation_date\n
+ , catalog.source_reference as specific_reference\n
<dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
- ,<dtml-var "query[\'order_by_expression\'].split(\' \')[0]">\n
- </dtml-if>\n
+ <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n
+ <dtml-if "not order_column in (\'operation_date\', \'specific_reference\')">\n
+ ,<dtml-var "query[\'order_by_expression\'].split(\' \')[0]">\n
+ </dtml-if>\n
+ </dtml-let>\n
+ </dtml-if>\n
+ <dtml-if delivery_mirror_section_title>, mirror_section_catalog.title as delivery_mirror_section_title</dtml-if>\n
<dtml-if select_expression><dtml-var select_expression> </dtml-if>\n
</dtml-if>\n
\n
@@ -1247,6 +1280,7 @@
<dtml-if "stat or omit_input or omit_output or node">\n
stock, catalog as child, </dtml-if>\n
<dtml-if "section_category">category, catalog as section, </dtml-if>\n
+ <dtml-if "delivery_mirror_section_title">delivery AS mirror_section_delivery, catalog AS mirror_section_catalog,</dtml-if>\n
catalog,\n
delivery\n
\n
@@ -1296,6 +1330,11 @@
AND section.uid = category.uid\n
AND category.category_uid =\n
<dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
+ </dtml-if>\n
+ <dtml-if "delivery_mirror_section_title">\n
+ AND mirror_section_catalog.uid = mirror_section_delivery.destination_section_uid\n
+ AND mirror_section_delivery.uid = catalog.uid\n
+ AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n
</dtml-if>\n
\n
<dtml-comment>\n
@@ -1390,10 +1429,16 @@
<dtml-unless sequence-start>,</dtml-unless>\n
<dtml-var sequence-item>\n
</dtml-in>\n
+ , delivery.stop_date as operation_date\n
+ , catalog.destination_reference as specific_reference\n
<dtml-if "not (stat or count) and query[\'order_by_expression\']">\n
- ,<dtml-var "query[\'order_by_expression\'].split(\' \')[0]">\n
- </dtml-if>\n
-\n
+ <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n
+ <dtml-if "not order_column in (\'operation_date\', \'specific_reference\')">\n
+ ,<dtml-var "query[\'order_by_expression\'].split(\' \')[0]">\n
+ </dtml-if>\n
+ </dtml-let>\n
+ </dtml-if>\n
+ <dtml-if delivery_mirror_section_title>, mirror_section_catalog.title as delivery_mirror_section_title</dtml-if>\n
<dtml-if select_expression><dtml-var select_expression> </dtml-if>\n
</dtml-if>\n
\n
@@ -1413,6 +1458,7 @@
<dtml-if "stat or omit_input or omit_output or node">\n
stock, catalog as child, </dtml-if>\n
<dtml-if "section_category">category, catalog as section, </dtml-if>\n
+ <dtml-if "delivery_mirror_section_title">delivery AS mirror_section_delivery, catalog AS mirror_section_catalog,</dtml-if>\n
catalog,\n
delivery\n
\n
@@ -1463,7 +1509,12 @@
AND category.category_uid =\n
<dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
</dtml-if>\n
- \n
+ <dtml-if "delivery_mirror_section_title">\n
+ AND mirror_section_catalog.uid = mirror_section_delivery.source_section_uid\n
+ AND mirror_section_delivery.uid = catalog.uid\n
+ AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n
+ </dtml-if>\n
+\n
<dtml-comment>\n
-- FIXME: we want stop date when we are destination_section and start_date when\n
-- we are source_section (one solution is to read in stock.date, but we try\n
@@ -1541,14 +1592,15 @@
\n
<dtml-if "count">\n
) as catalog\n
- </dtml-if>\n
-\n
- <dtml-if "stat">\n
+ <dtml-elif "stat">\n
) as sb\n
) as catalog\n
+ <dtml-else>\n
+ ) as catalog\n
</dtml-if>\n
\n
<dtml-if "not (stat or count)">\n
+ GROUP BY uid\n
<dtml-if "query[\'order_by_expression\']">\n
ORDER BY <dtml-var "query[\'order_by_expression\'].split(\'.\')[-1]">\n
</dtml-if>\n
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyTitle.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyTitle.xml?rev=19052&r1=19051&r2=19052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyTitle.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getThirdPartyTitle.xml Tue Feb 5 14:52:39 2008
@@ -66,21 +66,12 @@
<item>
<key> <string>_body</string> </key>
<value> <string># XXX bad name: AccountingTransaction_getMirrorSectionTitle sounds more consistent\n
-if selection_name is None:\n
- # TODO: this should definitivly be REQUEST chached\n
- selection_name = \'accounting_selection\'\n
-\n
-section_category=context.portal_selections.getSelectionParamsFor(selection_name).get(\'section_category\')\n
-if not section_category:\n
- return\n
-\n
if brain is not None:\n
transaction = brain.getObject()\n
else:\n
transaction = context\n
\n
-source_section = transaction.getSourceSectionValue()\n
-if source_section is not None and source_section.isMemberOf(section_category):\n
+if transaction.AccountingTransaction_isSourceView():\n
return transaction.getDestinationSectionTitle()\n
return transaction.getSourceSectionTitle()\n
</string> </value>
@@ -131,10 +122,8 @@
<string>kw</string>
<string>None</string>
<string>_getattr_</string>
+ <string>transaction</string>
<string>context</string>
- <string>section_category</string>
- <string>transaction</string>
- <string>source_section</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_accounting/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/change_log?rev=19052&r1=19051&r2=19052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/change_log Tue Feb 5 14:52:39 2008
@@ -1,3 +1,6 @@
+2008-2-5 yusei
+* Fixed third party column issue and optimize the query.
+
2008-2-4 yusei
* Optimize the query of accounting module list view.
* Fix displayed value of accounting operation date and make specific_reference column sortable.
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=19052&r1=19051&r2=19052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Tue Feb 5 14:52:39 2008
@@ -1,1 +1,1 @@
-569
+570
Modified: erp5/trunk/bt5/erp5_accounting/bt/template_catalog_method_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/template_catalog_method_id_list?rev=19052&r1=19051&r2=19052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/template_catalog_method_id_list (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/template_catalog_method_id_list Tue Feb 5 14:52:39 2008
@@ -1,3 +1,2 @@
-erp5_mysql_innodb/z_delivery_related_mirror_section
erp5_mysql_innodb/z_related_preferred_gap
erp5_mysql_innodb/z_related_strict_membership_preferred_gap
Modified: erp5/trunk/bt5/erp5_accounting/bt/template_catalog_related_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/template_catalog_related_key_list?rev=19052&r1=19051&r2=19052&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/template_catalog_related_key_list (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/template_catalog_related_key_list Tue Feb 5 14:52:39 2008
@@ -1,3 +1,2 @@
preferred_gap_id | category,catalog/id/z_related_preferred_gap
-preferred_gap_strict_membership_id | category,catalog/id/z_related_strict_membership_preferred_gap
-delivery_mirror_section_title | delivery,catalog/title/z_delivery_related_mirror_section
+preferred_gap_strict_membership_id | category,catalog/id/z_related_strict_membership_preferred_gap
More information about the Erp5-report
mailing list