diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml index e3b88d10b4f5f13ceda52409c596c1652883309e..f1d01f74519a518fcf5409be25d7b600996b103a 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml @@ -110,6 +110,8 @@ preferences = {\n if from_date:\n params[\'from_date\'] = from_date\n preferences[\'preferred_accounting_transaction_from_date\'] = from_date\n +else :\n + params[\'no_from_date\'] = 1\n if source_payment :\n params[\'payment_uid\'] = context.restrictedTraverse(source_payment).getUid()\n if destination_section :\n @@ -131,7 +133,7 @@ account_columns = (\n # (\'translated_simulation_state_title\', \'State\'),\n (\'debit\', \'Debit\'),\n (\'credit\', \'Credit\'),\n - (\'reference\', \'Accounting Transaction Reference\'),\n + (\'specific_reference\', \'Accounting Transaction Reference\'),\n (\'net_balance\', \'Balance\'),\n )\n \n diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml index 41aa320014c7c4989e341ea9fa356dd3067ca552..6ce175c5097f4225feac19fd69b7abf6eb536146 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml @@ -106,6 +106,8 @@ preferences = {\n if from_date:\n params[\'from_date\'] = from_date\n preferences[\'preferred_accounting_transaction_from_date\'] = from_date\n +else :\n + params[\'no_from_date\'] = 1\n \n ## FIXME: issue in reporting famework in ERP5 ? \n from Products.ERP5Type.Cache import clearCache\n diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml index d046d259b673e4585c755dc29aa62e4397363634..c798dfc6921df44bcb3829a43ba40e34c8442f71 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml @@ -99,7 +99,9 @@ params = {\n \n params[\'hide_grouping\'] = request[\'omit_grouped_references\']\n if from_date:\n - params[\'from_date\'] = from_date\n + params[\'from_date\'] = from_date\n +else :\n + params[\'no_from_date\'] = 1\n \n portal = context.portal_url.getPortalObject()\n simulation_tool = portal.portal_simulation\n diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml index 083f4774b4bbc2d1bbc5d465ba2233b22d311fae..50ca0f672aa6ccdd9986004fe42b0b9c1e48350a 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml @@ -73,7 +73,10 @@ from Products.ERP5Type.Document import newTempAccountingTransaction\n kwd={"omit_simulation" : 1}\n # read settings from user preference\n preference = context.getPortalObject().portal_preferences\n -from_date = kw.get(\'from_date\', preference\\\n +if kw.get(\'no_from_date\', 0) :\n + from_date = None \n +else :\n + from_date = kw.get(\'from_date\', preference\\\n .getPreferredAccountingTransactionFromDate())\n if from_date :\n kwd[\'from_date\'] = from_date\n @@ -239,6 +242,7 @@ return new_result\n <string>_getattr_</string> <string>context</string> <string>preference</string> + <string>None</string> <string>from_date</string> <string>_write_</string> <string>at_date</string> @@ -254,7 +258,6 @@ return new_result\n <string>_apply_</string> <string>result</string> <string>net_balance</string> - <string>None</string> <string>get_inventory_kw</string> <string>getInventoryAssetPrice</string> <string>last_total_debit</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statSourceBalance.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statSourceBalance.xml index c9ba3562573b6b4860aeae6ed5ad04d5d6127c94..9c17012ad55dffd313f5d4e2318065d46cb84af3 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statSourceBalance.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statSourceBalance.xml @@ -77,10 +77,14 @@ if kw.get(\'resource\'):\n \n # read settings from user preference\n preference = context.getPortalObject().portal_preferences\n -from_date = kw.get(\'from_date\',\n +if kw.get(\'no_from_date\', 0) :\n + from_date = None \n +else :\n + from_date = kw.get(\'from_date\',\n preference.getPreferredAccountingTransactionFromDate())\n if from_date :\n params[\'from_date\'] = from_date\n +\n at_date = kw.get(\'at_date\',\n preference.getPreferredAccountingTransactionAtDate())\n if at_date :\n @@ -191,6 +195,7 @@ return float(\'%.02f\' % (row.total_price or 0.0) )\n <string>KeyError</string> <string>AttributeError</string> <string>preference</string> + <string>None</string> <string>from_date</string> <string>at_date</string> <string>simulation_state</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_getAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_getAccountingTransactionList.xml index 92d85368443829a4b2e0a8c6f69ebcfb6560ce0a..f347cb0c4047208b7c98122b96e7207d1724a785 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_getAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_getAccountingTransactionList.xml @@ -74,7 +74,11 @@ LOG = lambda msg : context.log(\'Entity_getAccountingTransactionList\', msg)\n \n # read settings from user preference\n preference = context.getPortalObject().portal_preferences\n -from_date = preference.getPreferredAccountingTransactionFromDate()\n +\n +if kw.get(\'no_from_date\', 0) :\n + from_date = None \n +else :\n + from_date = preference.getPreferredAccountingTransactionFromDate()\n if from_date :\n kwd[\'from_date\'] = from_date\n \n @@ -183,6 +187,7 @@ return new_result\n <string>LOG</string> <string>context</string> <string>preference</string> + <string>None</string> <string>from_date</string> <string>at_date</string> <string>simulation_state</string> @@ -195,7 +200,6 @@ return new_result\n <string>_getiter_</string> <string>l</string> <string>o</string> - <string>None</string> <string>c</string> </tuple> </value> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statSourceBalance.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statSourceBalance.xml index 3dbdb66dd8151341821b29f9f540c025d06fa408..01995be3a7d8e494d43697221586317da94cb8d4 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statSourceBalance.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statSourceBalance.xml @@ -73,7 +73,10 @@ if kw.has_key(\'hide_grouping\'):\n \n # read settings from user preference\n preference = context.getPortalObject().portal_preferences\n -from_date = preference.getPreferredAccountingTransactionFromDate()\n +if kw.get(\'no_from_date\', 0) :\n + from_date = None \n +else :\n + from_date = preference.getPreferredAccountingTransactionFromDate()\n if from_date :\n kwd[\'from_date\'] = from_date\n at_date = preference.getPreferredAccountingTransactionAtDate()\n @@ -156,6 +159,7 @@ return float(\'%.02f\' % row.total_price or 0)\n <string>_write_</string> <string>context</string> <string>preference</string> + <string>None</string> <string>from_date</string> <string>at_date</string> <string>simulation_state</string>