From 51b6a177759fb3cf75dd60df54638f18b0a42f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Thu, 5 Oct 2006 12:07:54 +0000 Subject: [PATCH] support searches on date from Accounting Transaction Module. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10572 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...tingTransactionModule_countAccountingTransactionList.xml | 4 ++++ ...untingTransactionModule_getAccountingTransactionList.xml | 6 +++++- .../AccountingTransactionModule_statSourceCredit.xml | 4 +++- .../AccountingTransactionModule_statSourceDebit.xml | 4 +++- bt5/erp5_accounting/bt/revision | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml index a5e505ff82..65e71750ad 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml @@ -74,6 +74,9 @@ kw[\'omit_input\'] = 0\n kw[\'omit_output\'] = 0\n \n +if kw.get(\'delivery_start_date\'):\n + kw[\'delivery.start_date\'] = kw[\'delivery_start_date\']\n +\n return context.AccountingTransactionModule_zGetAccountingTransactionList( selection=None,\n selection_params=kw,\n stat=0,\n @@ -132,6 +135,7 @@ return context.AccountingTransactionModule_zGetAccountingTransactionList( select <string>kw</string> <string>_getattr_</string> <string>_write_</string> + <string>_getitem_</string> <string>_apply_</string> <string>context</string> <string>None</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml index 05960b6656..303c50e9a5 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml @@ -91,7 +91,10 @@ if params.get(\'count\', 0):\n params[\'omit_input\'] = 0\n params[\'omit_output\'] = 0\n \n -#context.log(\'LOG\', context.AccountingTransactionModule_zGetAccountingTransactionList(src__ =1, selection_params=params, **params))\n +if params.get(\'delivery_start_date\'):\n + params[\'delivery.start_date\'] = params[\'delivery_start_date\']\n +\n +#context.log(\'LOG (%s)\' % params, context.AccountingTransactionModule_zGetAccountingTransactionList(src__ =1, selection_params=params, **params))\n return context.AccountingTransactionModule_zGetAccountingTransactionList(selection_params=params, **params)\n @@ -146,6 +149,7 @@ return context.AccountingTransactionModule_zGetAccountingTransactionList(selecti <string>params</string> <string>_write_</string> <string>_getattr_</string> + <string>_getitem_</string> <string>_apply_</string> <string>context</string> </tuple> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.xml index 6a290e9a33..08c935a9c4 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.xml @@ -73,6 +73,8 @@ params[\'stat\'] = 1\n params[\'omit_input\'] = 1\n params[\'omit_output\'] = 0\n +if params.get(\'delivery_start_date\'):\n + params[\'delivery.start_date\'] = params[\'delivery_start_date\']\n \n result = context.AccountingTransactionModule_zGetAccountingTransactionList(\n selection=selection,\n @@ -133,10 +135,10 @@ return float(\'%.02f\' % (row.total_price and - row.total_price or 0.0))\n <string>_getattr_</string> <string>params</string> <string>_write_</string> + <string>_getitem_</string> <string>_apply_</string> <string>context</string> <string>result</string> - <string>_getitem_</string> <string>row</string> <string>float</string> </tuple> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.xml index 55a9dafc8c..4ecdad06d8 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.xml @@ -73,6 +73,8 @@ params[\'stat\'] = 1\n params[\'omit_output\'] = 1\n params[\'omit_input\'] = 0\n +if params.get(\'delivery_start_date\'):\n + params[\'delivery.start_date\'] = params[\'delivery_start_date\']\n \n result = context.AccountingTransactionModule_zGetAccountingTransactionList(\n selection=selection, selection_params = params, **params)\n @@ -132,10 +134,10 @@ return float(\'%.02f\' % (row.total_price or 0.0))\n <string>_getattr_</string> <string>params</string> <string>_write_</string> + <string>_getitem_</string> <string>_apply_</string> <string>context</string> <string>result</string> - <string>_getitem_</string> <string>row</string> <string>float</string> </tuple> diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 832332893a..3d9aebb2cc 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -67 \ No newline at end of file +68 \ No newline at end of file -- 2.30.9