Commit cb4b7ba5 authored by Jérome Perrin's avatar Jérome Perrin

earches by mirror section title on the accounting transaction module.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10573 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 51b6a177
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
<string>listbox_credit</string> <string>listbox_credit</string>
<string>listbox_debit</string> <string>listbox_debit</string>
<string>listbox_delivery_start_date</string> <string>listbox_delivery_start_date</string>
<string>listbox_delivery_mirror_section_title</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -334,7 +334,7 @@ ...@@ -334,7 +334,7 @@
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple> <tuple>
<string>AccountingTransaction_getThirdPartyTitle</string> <string>delivery_mirror_section_title</string>
<string>Third Party</string> <string>Third Party</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -403,7 +403,7 @@ ...@@ -403,7 +403,7 @@
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple> <tuple>
<string>AccountingTransaction_getThirdPartyTitle</string> <string>delivery_mirror_section_title</string>
<string>Third Party</string> <string>Third Party</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -491,6 +491,10 @@ ...@@ -491,6 +491,10 @@
<string>delivery.start_date</string> <string>delivery.start_date</string>
<string>delivery_start_date</string> <string>delivery_start_date</string>
</tuple> </tuple>
<tuple>
<string>delivery_mirror_section_title</string>
<string>delivery_mirror_section_title</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -618,7 +622,7 @@ ...@@ -618,7 +622,7 @@
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple> <tuple>
<string>AccountingTransaction_getThirdPartyTitle</string> <string>delivery_mirror_section_title</string>
<string>Third Party</string> <string>Third Party</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -666,7 +670,40 @@ ...@@ -666,7 +670,40 @@
<item> <item>
<key> <string>sort_columns</string> </key> <key> <string>sort_columns</string> </key>
<value> <value>
<list/> <list>
<tuple>
<string>id</string>
<string>ID</string>
</tuple>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>delivery_mirror_section_title</string>
<string>Third Party</string>
</tuple>
<tuple>
<string>translated_portal_type</string>
<string>Type</string>
</tuple>
<tuple>
<string>delivery.start_date</string>
<string>Date</string>
</tuple>
<tuple>
<string>reference</string>
<string>Invoice Number</string>
</tuple>
<tuple>
<string>specific_reference</string>
<string>Transaction Reference</string>
</tuple>
<tuple>
<string>translated_simulation_state_title</string>
<string>State</string>
</tuple>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -699,7 +736,7 @@ ...@@ -699,7 +736,7 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>AccountingTransaction_getThirdPartyTitle</string> <string>delivery_mirror_section_title</string>
<string>AccountingTransactionModule_getThirdPartyUrl</string> <string>AccountingTransactionModule_getThirdPartyUrl</string>
</tuple> </tuple>
</list> </list>
......
...@@ -429,28 +429,28 @@ ...@@ -429,28 +429,28 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>Default</string> </key> <key> <string>Default</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>date</string> </key> <key> <string>date</string> </key>
<value> <value>
<list> <list>
<string>year</string> <string>year</string>
<string>month</string> <string>month</string>
<string>day</string> <string>day</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>time</string> </key> <key> <string>time</string> </key>
<value> <value>
<list> <list>
<string>hour</string> <string>hour</string>
<string>minute</string> <string>minute</string>
<string>ampm</string> <string>ampm</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -68,11 +68,19 @@ ...@@ -68,11 +68,19 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>section_category=selection.getParams().get(\'section_category\')\n <value> <string>if selection is None:\n
# TODO: this should definitivly be REQUEST chached\n
selection = context.portal_selections.getSelectionFor(\'accounting_selection\')\n
\n
section_category=selection.getParams().get(\'section_category\')\n
if not section_category:\n if not section_category:\n
return\n return\n
\n \n
transaction = brain.getObject()\n if brain is not None:\n
transaction = brain.getObject()\n
else:\n
transaction = context\n
\n
source_section = transaction.getSourceSectionValue()\n source_section = transaction.getSourceSectionValue()\n
if source_section is not None and source_section.isMemberOf(section_category):\n if source_section is not None and source_section.isMemberOf(section_category):\n
return transaction.getDestinationSectionTitle()\n return transaction.getDestinationSectionTitle()\n
...@@ -93,7 +101,7 @@ return transaction.getSourceSectionTitle()\n ...@@ -93,7 +101,7 @@ return transaction.getSourceSectionTitle()\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>brain, selection, **kw</string> </value> <value> <string>brain=None, selection=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -122,11 +130,12 @@ return transaction.getSourceSectionTitle()\n ...@@ -122,11 +130,12 @@ return transaction.getSourceSectionTitle()\n
<string>brain</string> <string>brain</string>
<string>selection</string> <string>selection</string>
<string>kw</string> <string>kw</string>
<string>None</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string>
<string>section_category</string> <string>section_category</string>
<string>transaction</string> <string>transaction</string>
<string>source_section</string> <string>source_section</string>
<string>None</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -138,7 +147,10 @@ return transaction.getSourceSectionTitle()\n ...@@ -138,7 +147,10 @@ return transaction.getSourceSectionTitle()\n
<item> <item>
<key> <string>func_defaults</string> </key> <key> <string>func_defaults</string> </key>
<value> <value>
<none/> <tuple>
<none/>
<none/>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
68 69
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment