Commit 6e8f5b56 authored by Arnaud Fontaine's avatar Arnaud Fontaine

WIP

parent cfc2a84f
...@@ -22,6 +22,7 @@ context.activate().AccountingTransactionModule_viewFrenchAccountingTransactionFi ...@@ -22,6 +22,7 @@ context.activate().AccountingTransactionModule_viewFrenchAccountingTransactionFi
section_category, section_category,
section_category_strict, section_category_strict,
at_date, at_date,
group_by,
simulation_state, simulation_state,
ledger, ledger,
user_name=person_value.Person_getUserId(), user_name=person_value.Person_getUserId(),
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>section_category, section_category_strict, at_date, simulation_state, ledger=None, form_id=None, **kw</string> </value> <value> <string>section_category, section_category_strict, at_date, group_by, simulation_state, ledger=None, form_id=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -13,10 +13,6 @@ active_process = portal.portal_activities.newActiveProcess() ...@@ -13,10 +13,6 @@ active_process = portal.portal_activities.newActiveProcess()
priority = 4 priority = 4
#### AccountingTransactionModule_viewFrenchAccountingTransactionFileForPortalType #### AccountingTransactionModule_viewFrenchAccountingTransactionFileForPortalType
#kind = 'portal_type'
#kind = 'ledger'
kind = 'portal_type_ledger'
method_kw = { method_kw = {
'section_uid_list': section_uid_list, 'section_uid_list': section_uid_list,
} }
...@@ -44,7 +40,7 @@ if ledger is not None: ...@@ -44,7 +40,7 @@ if ledger is not None:
# (journal_code, journal_lib, search_kw) # (journal_code, journal_lib, search_kw)
journal_search_kw_list = [] journal_search_kw_list = []
if kind == 'ledger': if group_by == 'ledger':
if not ledger_obj_list: if not ledger_obj_list:
for ledger_relative_url, _ in context.AccountingTransactionModule_getLedgerItemList(): for ledger_relative_url, _ in context.AccountingTransactionModule_getLedgerItemList():
ledger_obj_list.append(category_tool.ledger.restrictedTraverse(ledger_relative_url)) ledger_obj_list.append(category_tool.ledger.restrictedTraverse(ledger_relative_url))
...@@ -55,7 +51,7 @@ if kind == 'ledger': ...@@ -55,7 +51,7 @@ if kind == 'ledger':
ledger_search_kw['default_ledger_uid'] = ledger_obj.getUid() ledger_search_kw['default_ledger_uid'] = ledger_obj.getUid()
journal_search_kw_list.append((ledger_obj.getReference() or ledger_obj.getId(), ledger_obj.getReference() or ledger_obj.getId(), ledger_search_kw)) journal_search_kw_list.append((ledger_obj.getReference() or ledger_obj.getId(), ledger_obj.getReference() or ledger_obj.getId(), ledger_search_kw))
elif kind == 'portal_type_ledger': elif group_by == 'portal_type_ledger':
if not ledger_obj_list: if not ledger_obj_list:
for ledger_relative_url, _ in context.AccountingTransactionModule_getLedgerItemList(): for ledger_relative_url, _ in context.AccountingTransactionModule_getLedgerItemList():
ledger_obj_list.append(category_tool.ledger.restrictedTraverse(ledger_relative_url)) ledger_obj_list.append(category_tool.ledger.restrictedTraverse(ledger_relative_url))
...@@ -71,7 +67,7 @@ elif kind == 'portal_type_ledger': ...@@ -71,7 +67,7 @@ elif kind == 'portal_type_ledger':
portal_type_ledger_search_kw)) portal_type_ledger_search_kw))
# kind == 'portal_type' # group_by == 'portal_type'
else: else:
if ledger_obj_list: if ledger_obj_list:
search_kw['default_ledger_uid'] = [ ledger_obj.getUid() for ledger_obj in ledger_obj_list ] search_kw['default_ledger_uid'] = [ ledger_obj.getUid() for ledger_obj in ledger_obj_list ]
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>section_category, section_category_strict, at_date, simulation_state, ledger, user_name, tag, aggregate_tag, **kw</string> </value> <value> <string>section_category, section_category_strict, at_date, group_by, simulation_state, ledger, user_name, tag, aggregate_tag, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>_proxy_roles</string> </key> <key> <string>_proxy_roles</string> </key>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</item> </item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>AccountingTransactionModule_viewFrenchAccountingTransactionExtendedFile</string> </value> <value> <string>AccountingTransactionModule_viewFrenchAccountingTransactionFileExtended</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -97,6 +97,7 @@ ...@@ -97,6 +97,7 @@
<string>your_section_category_strict</string> <string>your_section_category_strict</string>
<string>your_at_date</string> <string>your_at_date</string>
<string>your_ledger</string> <string>your_ledger</string>
<string>your_group_by</string>
</list> </list>
</value> </value>
</item> </item>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>items</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_group_by</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>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>field_id</string> </key>
<value> <string>my_dialog_mode_group_by</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewTradeFieldLibrary</string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<list>
<tuple>
<string>Portal Type</string>
<string>portal_type</string>
</tuple>
<tuple>
<string>Ledger</string>
<string>ledger</string>
</tuple>
<tuple>
<string>Both</string>
<string>portal_type_ledger</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
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