Skip to content

erp5
erp5
Commit 73ad48d0 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Add date and title columns for grouping dialog, and make columns sortable 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20011 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 36d2a22f
Show whitespace changes
Inline Side-by-side
Showing with 169 additions and 8 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getTransactionLineListForGroupingReference.xml
View file @ 73ad48d0
...@@ -80,9 +80,11 @@ orig_sort_on = portal.portal_selections.getSelectionSortOrder(\n ...@@ -80,9 +80,11 @@ orig_sort_on = portal.portal_selections.getSelectionSortOrder(\n
\'accounting_transaction_module_grouping_reference_fast_input\')\n \'accounting_transaction_module_grouping_reference_fast_input\')\n
sort_on = []\n sort_on = []\n
for sort_column, sort_order in orig_sort_on:\n for sort_column, sort_order in orig_sort_on:\n
if sort_column == \'node_title\':\n if sort_column in (\'date\', \'parent_title\'):\n
sort_on += [(sort_column, sort_order)]\n
elif sort_column == \'node_title\':\n
sort_on += [(\'stock.node_uid\', sort_order)]\n sort_on += [(\'stock.node_uid\', sort_order)]\n
elif sort_column == \'mirror_section_title\':\n elif sort_column == \'Movement_getMirrorSectionTitle\':\n
sort_on += [(\'stock.mirror_section_uid\', sort_order)]\n sort_on += [(\'stock.mirror_section_uid\', sort_order)]\n
\n \n
extra_query_keys = {}\n extra_query_keys = {}\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewGroupingFastInputDialog.xml
View file @ 73ad48d0
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
<string>listbox_credit</string> <string>listbox_credit</string>
<string>listbox_delivery_portal_type</string> <string>listbox_delivery_portal_type</string>
<string>listbox_node_title</string> <string>listbox_node_title</string>
<string>listbox_date</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewGroupingFastInputDialog/listbox.xml
View file @ 73ad48d0
...@@ -328,6 +328,14 @@ ...@@ -328,6 +328,14 @@
<string>delivery_reference</string> <string>delivery_reference</string>
<string>Transaction Reference</string> <string>Transaction Reference</string>
</tuple> </tuple>
<tuple>
<string>date</string>
<string>Date</string>
</tuple>
<tuple>
<string>parent_title</string>
<string>Title</string>
</tuple>
<tuple> <tuple>
<string>delivery_portal_type</string> <string>delivery_portal_type</string>
<string>Transaction Type</string> <string>Transaction Type</string>
...@@ -391,6 +399,10 @@ ...@@ -391,6 +399,10 @@
<key> <string>editable_columns</string> </key> <key> <string>editable_columns</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>date</string>
<string>Date</string>
</tuple>
<tuple> <tuple>
<string>debit</string> <string>debit</string>
<string>Debit</string> <string>Debit</string>
...@@ -498,9 +510,17 @@ ...@@ -498,9 +510,17 @@
<string>Account</string> <string>Account</string>
</tuple> </tuple>
<tuple> <tuple>
<string>mirror_section_title</string> <string>Movement_getMirrorSectionTitle</string>
<string>Third Party</string> <string>Third Party</string>
</tuple> </tuple>
<tuple>
<string>date</string>
<string>Date</string>
</tuple>
<tuple>
<string>parent_title</string>
<string>Title</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewGroupingFastInputDialog/listbox_date.xml 0 → 100644
View file @ 73ad48d0
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>default</string>
<string>editable</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_date</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>cell/date</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/bt/revision
View file @ 73ad48d0
641 642
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7