diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_copyInvoiceProperties.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_copyInvoiceProperties.xml index 74f2e70080b72c766201161e8611b4890326bf0b..ebce5b5ce9a75ac500cee79ff18889bafb3a5408 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_copyInvoiceProperties.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_copyInvoiceProperties.xml @@ -62,7 +62,7 @@ payment_transaction = context\n if payment_transaction.getSimulationState() == "draft":\n payment_transaction.portal_workflow.doActionFor(\n payment_transaction, \'plan_action\',\n - comment=translateString("Initialized by Delivery Builder."))\n + comment=translateString("Initialised by Delivery Builder."))\n </string> </value> </item> <item> diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index c73598001b3bfa7817fe382cc351ba36043c5739..8800cb9cad74255c7f83630c4e220740e8ce981f 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -863 \ No newline at end of file +864 \ No newline at end of file diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml index dc0d94f6052f71df43030613a31963a74178cf65..b80cd078667937837a1164e69885f2946a09a529 100644 --- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml +++ b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml @@ -92,7 +92,7 @@ if invoice.getSimulationState() == \'draft\':\n try :\n context.getPortalObject().portal_workflow.doActionFor(\n invoice, \'confirm_action\',\n - comment=translateString(\'Initialized by Delivery Builder.\'),\n + comment=translateString(\'Initialised by Delivery Builder.\'),\n skip_period_validation=1)\n except WorkflowException, e:\n # The user cannot pass the transition, it\'s OK\n @@ -100,7 +100,7 @@ if invoice.getSimulationState() == \'draft\':\n \n if invoice.getSimulationState() == \'draft\':\n # call the workflow method, if the user cannot perform this operation.\n - invoice.confirm(comment=translateString(\'Initialized by Delivery Builder.\'),)\n + invoice.confirm(comment=translateString(\'Initialised by Delivery Builder.\'),)\n \n \n # First set the invoice in the building state on the causality workflow\n diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision index 73181427a2868edd79f087fb2c0ac0fce92314b6..ae4ee13c08e7628701b925b8962108bd7643bf6e 100644 --- a/bt5/erp5_invoicing/bt/revision +++ b/bt5/erp5_invoicing/bt/revision @@ -1 +1 @@ -199 \ No newline at end of file +200 \ No newline at end of file diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_confirm.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_confirm.xml index 73a2281d80cccb6dd98284effe39f5b71dcee8de..b376ca920338dc68dbde394de50f2a81a2ed61f3 100644 --- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_confirm.xml +++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionDelivery_confirm.xml @@ -61,7 +61,7 @@ if packing_list_state == "draft":\n packing_list.portal_workflow.doActionFor(\n packing_list,\n \'confirm_action\',\n - comment=Message(\'erp5_ui\', \'Initialized by Delivery Builder\'))\n + comment=Message(\'erp5_ui\', \'Initialised by Delivery Builder\'))\n </string> </value> </item> <item> diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision index 304feabdcedcee70e4d929e2dbee0a6205be7af6..d2d07760f55c342234ea03d7efe51768da145f23 100644 --- a/bt5/erp5_mrp/bt/revision +++ b/bt5/erp5_mrp/bt/revision @@ -1 +1 @@ -387 \ No newline at end of file +388 \ No newline at end of file diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml index 7bf1879c5ac07705e8df419f30e29b9f2ca92634..20430e305f3bda0b10c67b94c27fc7fcd8e84fe3 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml @@ -64,7 +64,7 @@ packing_list = context\n # Modify state\n packing_list_state = packing_list.getSimulationState()\n if packing_list_state == "draft":\n - packing_list.confirm(comment=translateString(\'Initialized by Delivery Builder.\'))\n + packing_list.confirm(comment=translateString(\'Initialised by Delivery Builder.\'))\n </string> </value> </item> <item> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml index be5d8df53ee035ea6eab190a4334e3b0c102f02c..ffd7200465af7576b89655f76c4cd74841e59d26 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml @@ -67,7 +67,7 @@ packing_list.PackingList_copyOrderProperties()\n packing_list_state = packing_list.getSimulationState()\n \n if packing_list_state == "draft":\n - packing_list.confirm(comment=translateString(\'Initialized by Delivery Builder.\'))\n + packing_list.confirm(comment=translateString(\'Initialised by Delivery Builder.\'))\n \n # First set the packing_list in the building state\n packing_list.startBuilding()\n diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 25802a20038d64f3d8a67c217ce49cac10c4fc33..995fb338a8d0db69b3a4be8d7c3c1c0a2d52dbfc 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -592 \ No newline at end of file +593 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObject.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObject.xml index 22e6095400909fbdd8a4c42be699366ae99c1b03..892ed1a591375e1470da08dfef27fcb2c9f7e7db 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObject.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObject.xml @@ -106,7 +106,7 @@ elif len(related_list) == 1:\n "that_title" : context.getTitleOrId() }), \'utf8\'))\n else :\n url = context.absolute_url()\n - message = Base_translateString("You are not authorized to view the related document.")\n + message = Base_translateString("You are not authorised to view the related document.")\n relation_found = 0\n \n else:\n @@ -125,7 +125,7 @@ else:\n uid=get_uid_method(portal_type=portal_type,\n checked_permission=\'View\')))\n \n - # compute the list of objects we are actually authorized to view\n + # compute the list of objects we are actually authorised to view\n related_object_list = []\n for path in search_method(portal_type=portal_type) :\n obj = context.getPortalObject().restrictedTraverse(path, None)\n @@ -138,7 +138,7 @@ else:\n related_object_list.append(obj)\n if len(related_object_list) == 0 :\n url = context.absolute_url()\n - message = Base_translateString("You are not authorized to view any related document.")\n + message = Base_translateString("You are not authorised to view any related document.")\n relation_found = 0\n else :\n request=context.REQUEST\n diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index bf0a67dc5c6d9daa0cc813b0c127090457fe6b90..77bdd49b54fc4dab5d498705cf6d4df5982d6d55 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -1084 \ No newline at end of file +1085 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml index f1db1e79d30f691c5cf4f3e2164732a0c0293e87..a19be08a5c1e01ee0120ab379e9391d3fcfe229c 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/navigation_box_render.xml @@ -73,11 +73,11 @@ i18n:translate="" i18n:domain="ui"></option>\n </tal:block>\n </select>\n - <button type="submit" name="Base_doFavorite:method" title="Select Favorite"\n + <button type="submit" name="Base_doFavorite:method" title="Select Favourite"\n i18n:attributes="title" i18n:domain="ui">\n <span class="image"></span>\n <span class="description"\n - i18n:translate="" i18n:domain="ui">Select Favorite</span>\n + i18n:translate="" i18n:domain="ui">Select Favourite</span>\n </button>\n </span>\n <span class="separator"><!--separator--></span>\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 0905ea78aba8dbc76598cb3610907683a1cb4525..837f72e62aada6de3f28d3e73245f0f786b5418c 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -642 \ No newline at end of file +643 \ No newline at end of file