diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml index 21e97117a44756a795be5f9e37ee1f5b9e43eecb..a01c85aa70feb141fccc96b825fb86b10c2bbf11 100644 --- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml +++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asPredicate.xml @@ -54,8 +54,8 @@ <item> <key> <string>_body</string> </key> <value> <string>context = context.asContext(\n - _range_criterion = {\'start_date\': (context.getStartDate(),\n - context.getStopDate())\n + _range_criterion = {\'start_date\': (context.getStartDateRangeMin(),\n + context.getStartDateRangeMax())\n })\n return context\n \n diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList.xml index 88aa17aff79a83c9877b55c88e2bafa0912ad496..10b2d102be195f4b7438eced4ea673f27d1833bd 100644 --- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList.xml +++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList.xml @@ -82,8 +82,8 @@ <key> <string>hidden</string> </key> <value> <list> - <string>listbox_start_date_range_min</string> - <string>listbox_start_date_range_max</string> + <string>listbox_predicate_start_date_range_max</string> + <string>listbox_predicate_start_date_range_min</string> </list> </value> </item> diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox.xml index d6cb3f0ce674c23636f92584692e803a8c55f926..5cf24bae2bc2461b9b586271d015af6c4a6c1e51 100644 --- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox.xml +++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox.xml @@ -129,11 +129,11 @@ <string>Budget</string> </tuple> <tuple> - <string>start_date_range_min</string> + <string>predicate.start_date_range_min</string> <string>Begin Date</string> </tuple> <tuple> - <string>start_date_range_max</string> + <string>predicate.start_date_range_max</string> <string>End Date</string> </tuple> <tuple> @@ -167,11 +167,11 @@ <value> <list> <tuple> - <string>start_date_range_min</string> + <string>predicate.start_date_range_min</string> <string>Begin Date</string> </tuple> <tuple> - <string>start_date_range_max</string> + <string>predicate.start_date_range_max</string> <string>End Date</string> </tuple> </list> @@ -233,11 +233,11 @@ <string>Version</string> </tuple> <tuple> - <string>start_date_range_min</string> + <string>predicate.start_date_range_min</string> <string>Begin Date</string> </tuple> <tuple> - <string>start_date_range_max</string> + <string>predicate.start_date_range_max</string> <string>End Date</string> </tuple> <tuple> @@ -284,11 +284,11 @@ <string>Version</string> </tuple> <tuple> - <string>start_date_range_min</string> + <string>predicate.start_date_range_min</string> <string>Begin Date</string> </tuple> <tuple> - <string>start_date_range_max</string> + <string>predicate.start_date_range_max</string> <string>End Date</string> </tuple> <tuple> diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_start_date_range_min.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_max.xml similarity index 97% rename from bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_start_date_range_min.xml rename to bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_max.xml index 71f6422516b73d87424e243b76ec986d835b9e12..21199fa96ed835fdd783b0a25c8cbcc5ad572186 100644 --- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_start_date_range_min.xml +++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_max.xml @@ -20,7 +20,7 @@ </item> <item> <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> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_start_date_range_max.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_min.xml similarity index 97% rename from bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_start_date_range_max.xml rename to bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_min.xml index e605967b9b4e4d91800983172ed9eed4564d5721..2fc3205531ca83be0188da050ea6ba3cc00de16f 100644 --- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_start_date_range_max.xml +++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetList/listbox_predicate_start_date_range_min.xml @@ -20,7 +20,7 @@ </item> <item> <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> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_asPredicate.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_asPredicate.xml new file mode 100644 index 0000000000000000000000000000000000000000..c029bdc1d8c5a75ab20ddc2fb34ae37a24cbbe0f --- /dev/null +++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_asPredicate.xml @@ -0,0 +1,125 @@ +<?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> diff --git a/bt5/erp5_budget/bt/revision b/bt5/erp5_budget/bt/revision index c390b4cff15f60e3c7c12561c444c6f029cb8ef2..bb81456fa19cded30402e6818c590bde4d91ead9 100644 --- a/bt5/erp5_budget/bt/revision +++ b/bt5/erp5_budget/bt/revision @@ -1 +1 @@ -261 \ No newline at end of file +262 \ No newline at end of file