diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingPeriod_init.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingPeriod_init.xml index cbc7d22b4b575e16eed181bc7daba6c92467f198..6cb4cd421be6e31fcb976b31dc2bb9e5f8a3d28d 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingPeriod_init.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingPeriod_init.xml @@ -72,7 +72,7 @@ portal = context.getPortalObject()\n \n period_list = context.getParentValue()\\\n .searchFolder( simulation_state = [\'planned\', \'confirmed\', \'delivered\'],\n - sort_on = (\'delivery.stop_date\', \'ASC\'))\n + sort_on = [(\'delivery.stop_date\', \'ASC\'),] )\n \n if len(period_list) > 0 :\n last_period = period_list[-1].getObject()\n diff --git a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_period_workflow/scripts/AccountingPeriod_CheckDates.xml b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_period_workflow/scripts/AccountingPeriod_CheckDates.xml index 69c6371ca279182361c9b817e8c4b0ac6057791e..b82873b2fb0dbcf2148515ae2042f79ebb7fd679 100755 --- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_period_workflow/scripts/AccountingPeriod_CheckDates.xml +++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_period_workflow/scripts/AccountingPeriod_CheckDates.xml @@ -81,9 +81,12 @@ stop_date = closing_period.getStopDate()\n if start_date > stop_date :\n raise ValidationFailed, N_("Start Date is After Stop Date")\n \n +if start_date.year() != stop_date.year() :\n + raise ValidationFailed, N_("Start Date is not the same year as Stop Date")\n +\n period_list = closing_period.getParentValue().searchFolder(\n simulation_state = valid_states,\n - sort_on = \'delivery.start_date\',\n + sort_on = [(\'delivery.start_date\', \'asc\')],\n portal_type = \'Accounting Period\')\n \n for period in period_list :\n