Skip to content

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

make budgets searchable by date, and fixes problems with dates on budget line as predicate 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30931 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d31d2cb9
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 15 deletions
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml
View file @ a5ecb2e9
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>context = context.asContext(\n <value> <string>context = context.asContext(\n
_range_criterion = {\'start_date\': (context.getStartDate(),\n _range_criterion = {\'start_date\': (context.getStartDateRangeMin(),\n
context.getStopDate())\n context.getStartDateRangeMax())\n
})\n })\n
return context\n return context\n
\n \n
......
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList.xml
View file @ a5ecb2e9
...@@ -82,8 +82,8 @@ ...@@ -82,8 +82,8 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list> <list>
<string>listbox_start_date_range_min</string> <string>listbox_predicate_start_date_range_max</string>
<string>listbox_start_date_range_max</string> <string>listbox_predicate_start_date_range_min</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox.xml
View file @ a5ecb2e9
...@@ -129,11 +129,11 @@ ...@@ -129,11 +129,11 @@
<string>Budget</string> <string>Budget</string>
</tuple> </tuple>
<tuple> <tuple>
<string>start_date_range_min</string> <string>predicate.start_date_range_min</string>
<string>Begin Date</string> <string>Begin Date</string>
</tuple> </tuple>
<tuple> <tuple>
<string>start_date_range_max</string> <string>predicate.start_date_range_max</string>
<string>End Date</string> <string>End Date</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -167,11 +167,11 @@ ...@@ -167,11 +167,11 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>start_date_range_min</string> <string>predicate.start_date_range_min</string>
<string>Begin Date</string> <string>Begin Date</string>
</tuple> </tuple>
<tuple> <tuple>
<string>start_date_range_max</string> <string>predicate.start_date_range_max</string>
<string>End Date</string> <string>End Date</string>
</tuple> </tuple>
</list> </list>
...@@ -233,11 +233,11 @@ ...@@ -233,11 +233,11 @@
<string>Version</string> <string>Version</string>
</tuple> </tuple>
<tuple> <tuple>
<string>start_date_range_min</string> <string>predicate.start_date_range_min</string>
<string>Begin Date</string> <string>Begin Date</string>
</tuple> </tuple>
<tuple> <tuple>
<string>start_date_range_max</string> <string>predicate.start_date_range_max</string>
<string>End Date</string> <string>End Date</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -284,11 +284,11 @@ ...@@ -284,11 +284,11 @@
<string>Version</string> <string>Version</string>
</tuple> </tuple>
<tuple> <tuple>
<string>start_date_range_min</string> <string>predicate.start_date_range_min</string>
<string>Begin Date</string> <string>Begin Date</string>
</tuple> </tuple>
<tuple> <tuple>
<string>start_date_range_max</string> <string>predicate.start_date_range_max</string>
<string>End Date</string> <string>End Date</string>
</tuple> </tuple>
<tuple> <tuple>
......
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_start_date_range_min.xml → bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_max.xml
View file @ a5ecb2e9
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_start_date_range_min</string> </value> <value> <string>listbox_predicate_start_date_range_max</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_start_date_range_max.xml → bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_min.xml
View file @ a5ecb2e9
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_start_date_range_max</string> </value> <value> <string>listbox_predicate_start_date_range_min</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_asPredicate.xml 0 → 100644
View file @ a5ecb2e9
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return context.asContext(\n
_range_criterion = {\'start_date\': (context.getStartDateRangeMin(),\n
context.getStartDateRangeMax())\n
})\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>_getattr_</string>
<string>context</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Budget_asPredicate</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_budget/bt/revision
View file @ a5ecb2e9
261 262
\ 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