diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartDefaultCurrency.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartDefaultCurrency.xml similarity index 91% rename from bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartDefaultCurrency.xml rename to bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartDefaultCurrency.xml index a879b949bba97cfc8bd3ef9c2f6048be49242224..01d83225456a307921541048a4f1d24f6c288c74 100644 --- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartDefaultCurrency.xml +++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartDefaultCurrency.xml @@ -54,11 +54,10 @@ <item> <key> <string>_body</string> </key> <value> <string>""" \n - Return default currency used in shopping_cart.\n - Please update accordingly relative path. \n - XXX: there must be an way to do this better?\n + Return default currency used in Shopping Cart.\n """\n -return context.getPortalObject().restrictedTraverse(\'currency_module/EUR\')\n +web_site = context.getWebSiteValue()\n +return context.getPortalObject().restrictedTraverse(web_site.getLayoutProperty(\'ecommerce_base_currency\', \'currency_module/EUR\'))\n </string> </value> </item> <item> @@ -74,9 +73,7 @@ return context.getPortalObject().restrictedTraverse(\'currency_module/EUR\')\n <item> <key> <string>_proxy_roles</string> </key> <value> - <tuple> - <string>Manager</string> - </tuple> + <tuple/> </value> </item> <item> @@ -105,6 +102,7 @@ return context.getPortalObject().restrictedTraverse(\'currency_module/EUR\')\n <tuple> <string>_getattr_</string> <string>context</string> + <string>web_site</string> </tuple> </value> </item> @@ -121,7 +119,7 @@ return context.getPortalObject().restrictedTraverse(\'currency_module/EUR\')\n </item> <item> <key> <string>id</string> </key> - <value> <string>SaleOrder_getShoppingCartDefaultCurrency</string> </value> + <value> <string>WebSite_getShoppingCartDefaultCurrency</string> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartDefaultCurrencyCode.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartDefaultCurrencyCode.xml similarity index 91% rename from bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartDefaultCurrencyCode.xml rename to bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartDefaultCurrencyCode.xml index 9e46217035bd2318fd4b38ea45ba5fcdac2aa7b7..a67738a2b461d1f592e7bb10059f25f83c3b6c9e 100644 --- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartDefaultCurrencyCode.xml +++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartDefaultCurrencyCode.xml @@ -54,11 +54,9 @@ <item> <key> <string>_body</string> </key> <value> <string>""" \n - Return default currency used in shopping_cart.\n - Please update accordingly relative path. \n - XXX: there must be an way to do this better?\n + Return reference of the default currency used in Shopping Cart.\n """\n -return context.getPortalObject().SaleOrder_getShoppingCartDefaultCurrency().getReference()\n +return context.getWebSiteValue().WebSite_getShoppingCartDefaultCurrency().getReference()\n </string> </value> </item> <item> @@ -74,9 +72,7 @@ return context.getPortalObject().SaleOrder_getShoppingCartDefaultCurrency().getR <item> <key> <string>_proxy_roles</string> </key> <value> - <tuple> - <string>Manager</string> - </tuple> + <tuple/> </value> </item> <item> @@ -121,7 +117,7 @@ return context.getPortalObject().SaleOrder_getShoppingCartDefaultCurrency().getR </item> <item> <key> <string>id</string> </key> - <value> <string>SaleOrder_getShoppingCartDefaultCurrencyCode</string> </value> + <value> <string>WebSite_getShoppingCartDefaultCurrencyCode</string> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartDefaultCurrencySymbol.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartDefaultCurrencySymbol.xml similarity index 91% rename from bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartDefaultCurrencySymbol.xml rename to bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartDefaultCurrencySymbol.xml index 4640bd00d5b724c88004339b108bac75e4ecc0cc..cf9f6236ae70a955af348db6410aa689bd5c4e3f 100644 --- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartDefaultCurrencySymbol.xml +++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartDefaultCurrencySymbol.xml @@ -54,11 +54,9 @@ <item> <key> <string>_body</string> </key> <value> <string>""" \n - Return default currency used in shopping_cart.\n - Please update accordingly relative path. \n - XXX: there must be an way to do this better?\n + Return the sort title of the default currency used in Shopping Cart.\n """\n -return context.getPortalObject().SaleOrder_getShoppingCartDefaultCurrency().getShortTitle()\n +return context.getWebSiteValue().WebSite_getShoppingCartDefaultCurrency().getShortTitle()\n </string> </value> </item> <item> @@ -74,9 +72,7 @@ return context.getPortalObject().SaleOrder_getShoppingCartDefaultCurrency().getS <item> <key> <string>_proxy_roles</string> </key> <value> - <tuple> - <string>Manager</string> - </tuple> + <tuple/> </value> </item> <item> @@ -121,7 +117,7 @@ return context.getPortalObject().SaleOrder_getShoppingCartDefaultCurrency().getS </item> <item> <key> <string>id</string> </key> - <value> <string>SaleOrder_getShoppingCartDefaultCurrencySymbol</string> </value> + <value> <string>WebSite_getShoppingCartDefaultCurrencySymbol</string> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_commerce/bt/revision b/bt5/erp5_commerce/bt/revision index 20ad60520b19499aa06741e562c6f79e8c99c9c5..565f1b06a1a6a367321480dffb082fb8709a4f31 100644 --- a/bt5/erp5_commerce/bt/revision +++ b/bt5/erp5_commerce/bt/revision @@ -1 +1 @@ -230 \ No newline at end of file +231 \ No newline at end of file