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 cc1997e1684d0b9e36523fce02fb6d75a79eede5..fa84db2c1444253bd3046f64fc3879e733a64f2c 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 @@ -60,7 +60,7 @@ kw[\'omit_output\'] = 0\n kw[\'source_section_where_expression\'] = \'\'\n kw[\'destination_section_where_expression\'] = \'\'\n \n -if kw.get(\'operation_date\', {}).get(\'query\'):\n +if (kw.get(\'operation_date\') or {}).get(\'query\'):\n buildSQLQuery = context.portal_catalog.buildSQLQuery\n kw[\'source_section_where_expression\'] = buildSQLQuery(\n **{\'delivery.start_date\': kw[\'operation_date\']})[\'where_expression\']\n @@ -76,14 +76,77 @@ return context.AccountingTransactionModule_zGetAccountingTransactionList( select **kw )\n </string> </value> </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>_params</string> </key> <value> <string>brain=None, selection=None, **kw</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>2</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>brain</string> + <string>selection</string> + <string>kw</string> + <string>_getattr_</string> + <string>_write_</string> + <string>context</string> + <string>buildSQLQuery</string> + <string>_getitem_</string> + <string>_apply_</string> + <string>None</string> + </tuple> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>func_defaults</string> </key> + <value> + <tuple> + <none/> + <none/> + </tuple> + </value> + </item> <item> <key> <string>id</string> </key> <value> <string>AccountingTransactionModule_countAccountingTransactionList</string> </value> </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> </dictionary> </pickle> </record> 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 56dc01d3f76346cb340ebc78b79997ba53493515..12722108152c954852b20d48e0090f7ae61916ae 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 @@ -78,7 +78,7 @@ params[\'omit_output\'] = 0\n params[\'source_section_where_expression\'] = \'\'\n params[\'destination_section_where_expression\'] = \'\'\n \n -if params.get(\'operation_date\', {}).get(\'query\'):\n +if (params.get(\'operation_date\') or {}).get(\'query\'):\n buildSQLQuery = context.portal_catalog.buildSQLQuery\n params[\'source_section_where_expression\'] = buildSQLQuery(\n **{\'delivery.start_date\': params[\'operation_date\']})[\'where_expression\']\n @@ -104,14 +104,74 @@ return context.AccountingTransactionModule_zGetAccountingTransactionList( \n ]]></string> </value> </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>_params</string> </key> <value> <string>**params</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>params</string> + <string>_write_</string> + <string>_getattr_</string> + <string>context</string> + <string>buildSQLQuery</string> + <string>_getitem_</string> + <string>_apply_</string> + <string>src__</string> + <string>None</string> + <string>search_result_keys</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>AccountingTransactionModule_getAccountingTransactionList</string> </value> </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> </dictionary> </pickle> </record> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml index a155334570cecea4a9defc23e295596e51be0c0f..a9aa95a9c7f0d0948b116983031eac84a4fa88d7 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml @@ -576,7 +576,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:[(\'section_category\', here.portal_preferences.getPreferredAccountingTransactionSectionCategory()), (\'section_category_strict\', here.portal_preferences.getPreferredAccountingSectionCategoryStrict())]</string> </value> + <value> <string>python:[(\'section_category\', preferences.getPreferredAccountingTransactionSectionCategory()), (\'section_category_strict\', preferences.getPreferredAccountingSectionCategoryStrict())]</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 473aa3ce3316b9de2f30882be30dc2cc6bf80d59..33bf6f677da8de591344ba9b9c88520d20d6659a 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1413 \ No newline at end of file +1414 \ No newline at end of file