Interface_Adminhtml_Default - Version 1.8.0.0

Version Notes

1.8.0.0

Download this release

Release Info

Developer Magento Core Team
Extension Interface_Adminhtml_Default
Version 1.8.0.0
Comparing to
See all releases


Code changes from version 1.7.0.1 to 1.8.0.0

Files changed (425) hide show
  1. app/design/adminhtml/default/default/layout/admin.xml +1 -1
  2. app/design/adminhtml/default/default/layout/adminnotification.xml +1 -1
  3. app/design/adminhtml/default/default/layout/api2.xml +1 -1
  4. app/design/adminhtml/default/default/layout/authorizenet.xml +1 -1
  5. app/design/adminhtml/default/default/layout/bundle.xml +1 -1
  6. app/design/adminhtml/default/default/layout/captcha.xml +1 -1
  7. app/design/adminhtml/default/default/layout/catalog.xml +1 -1
  8. app/design/adminhtml/default/default/layout/cms.xml +1 -1
  9. app/design/adminhtml/default/default/layout/connect.xml +1 -1
  10. app/design/adminhtml/default/default/layout/currencysymbol.xml +1 -1
  11. app/design/adminhtml/default/default/layout/customer.xml +1 -1
  12. app/design/adminhtml/default/default/layout/dataflow.xml +1 -1
  13. app/design/adminhtml/default/default/layout/downloadable.xml +1 -1
  14. app/design/adminhtml/default/default/layout/giftmessage.xml +1 -1
  15. app/design/adminhtml/default/default/layout/index.xml +7 -1
  16. app/design/adminhtml/default/default/layout/main.xml +1 -1
  17. app/design/adminhtml/default/default/layout/newsletter.xml +1 -1
  18. app/design/adminhtml/default/default/layout/oauth.xml +1 -1
  19. app/design/adminhtml/default/default/layout/pagecache.xml +1 -1
  20. app/design/adminhtml/default/default/layout/promo.xml +1 -1
  21. app/design/adminhtml/default/default/layout/report.xml +1 -1
  22. app/design/adminhtml/default/default/layout/rss.xml +1 -1
  23. app/design/adminhtml/default/default/layout/sales.xml +1 -1
  24. app/design/adminhtml/default/default/layout/search.xml +1 -1
  25. app/design/adminhtml/default/default/layout/tag.xml +1 -1
  26. app/design/adminhtml/default/default/layout/tax.xml +34 -0
  27. app/design/adminhtml/default/default/layout/widget.xml +1 -1
  28. app/design/adminhtml/default/default/template/access_denied.phtml +1 -1
  29. app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml +1 -1
  30. app/design/adminhtml/default/default/template/api/roleinfo.phtml +1 -1
  31. app/design/adminhtml/default/default/template/api/roles.phtml +1 -1
  32. app/design/adminhtml/default/default/template/api/rolesedit.phtml +1 -1
  33. app/design/adminhtml/default/default/template/api/rolesusers.phtml +1 -1
  34. app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml +1 -1
  35. app/design/adminhtml/default/default/template/api/userinfo.phtml +1 -1
  36. app/design/adminhtml/default/default/template/api/usernroles.phtml +1 -1
  37. app/design/adminhtml/default/default/template/api/userroles.phtml +1 -1
  38. app/design/adminhtml/default/default/template/api/users.phtml +1 -1
  39. app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml +1 -1
  40. app/design/adminhtml/default/default/template/api2/attribute/resource.phtml +1 -1
  41. app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml +1 -1
  42. app/design/adminhtml/default/default/template/api2/role/buttons.phtml +1 -1
  43. app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml +1 -1
  44. app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml +1 -1
  45. app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml +1 -1
  46. app/design/adminhtml/default/default/template/backup/left.phtml +1 -1
  47. app/design/adminhtml/default/default/template/backup/list.phtml +1 -1
  48. app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml +1 -1
  49. app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml +1 -1
  50. app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml +1 -1
  51. app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml +1 -1
  52. app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml +1 -1
  53. app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml +10 -1
  54. app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml +1 -1
  55. app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml +1 -1
  56. app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml +2 -2
  57. app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml +4 -4
  58. app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml +4 -4
  59. app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml +4 -4
  60. app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml +4 -4
  61. app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml +4 -4
  62. app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml +4 -4
  63. app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml +4 -4
  64. app/design/adminhtml/default/default/template/captcha/zend.phtml +1 -1
  65. app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml +1 -1
  66. app/design/adminhtml/default/default/template/catalog/category/edit.phtml +1 -1
  67. app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml +2 -2
  68. app/design/adminhtml/default/default/template/catalog/category/tree.phtml +1 -1
  69. app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml +1 -1
  70. app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml +6 -2
  71. app/design/adminhtml/default/default/template/catalog/product.phtml +1 -1
  72. app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml +1 -1
  73. app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml +1 -1
  74. app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml +3 -2
  75. app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml +2 -2
  76. app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml +1 -1
  77. app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml +1 -1
  78. app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml +1 -1
  79. app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml +1 -1
  80. app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml +1 -1
  81. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml +1 -1
  82. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml +1 -1
  83. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml +1 -1
  84. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml +1 -1
  85. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml +1 -1
  86. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml +1 -1
  87. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml +2 -2
  88. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml +1 -1
  89. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml +1 -1
  90. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml +1 -1
  91. app/design/adminhtml/default/default/template/catalog/product/created.phtml +1 -1
  92. app/design/adminhtml/default/default/template/catalog/product/edit.phtml +1 -1
  93. app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml +1 -1
  94. app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml +1 -1
  95. app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml +1 -1
  96. app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml +1 -1
  97. app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml +1 -1
  98. app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml +1 -1
  99. app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml +1 -1
  100. app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml +1 -1
  101. app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml +1 -1
  102. app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml +1 -1
  103. app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml +1 -1
  104. app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml +3 -3
  105. app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml +1 -1
  106. app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml +1 -1
  107. app/design/adminhtml/default/default/template/catalog/product/edit/websites.phtml +1 -1
  108. app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml +3 -3
  109. app/design/adminhtml/default/default/template/catalog/product/js.phtml +1 -1
  110. app/design/adminhtml/default/default/template/catalog/product/price.phtml +1 -1
  111. app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml +1 -1
  112. app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml +1 -1
  113. app/design/adminhtml/default/default/template/catalog/product/widget/chooser/container.phtml +1 -1
  114. app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml +2 -1
  115. app/design/adminhtml/default/default/template/cms/browser/content.phtml +1 -1
  116. app/design/adminhtml/default/default/template/cms/browser/content/files.phtml +1 -1
  117. app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml +1 -1
  118. app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml +1 -1
  119. app/design/adminhtml/default/default/template/cms/browser/js.phtml +1 -1
  120. app/design/adminhtml/default/default/template/cms/browser/tree.phtml +1 -1
  121. app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml +1 -1
  122. app/design/adminhtml/default/default/template/coming.phtml +1 -1
  123. app/design/adminhtml/default/default/template/connect/extension/custom/authors.phtml +1 -1
  124. app/design/adminhtml/default/default/template/connect/extension/custom/contents.phtml +1 -1
  125. app/design/adminhtml/default/default/template/connect/extension/custom/depends.phtml +1 -1
  126. app/design/adminhtml/default/default/template/connect/extension/custom/load.phtml +1 -1
  127. app/design/adminhtml/default/default/template/connect/extension/custom/package.phtml +1 -1
  128. app/design/adminhtml/default/default/template/connect/extension/custom/release.phtml +1 -1
  129. app/design/adminhtml/default/default/template/currencysymbol/grid.phtml +1 -1
  130. app/design/adminhtml/default/default/template/customer/edit/js.phtml +1 -1
  131. app/design/adminhtml/default/default/template/customer/edit/tab/account/form/renderer/group.phtml +1 -1
  132. app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml +1 -1
  133. app/design/adminhtml/default/default/template/customer/online.phtml +1 -1
  134. app/design/adminhtml/default/default/template/customer/sales/order/create/address/form/renderer/vat.phtml +1 -1
  135. app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml +1 -1
  136. app/design/adminhtml/default/default/template/customer/tab/addresses.phtml +4 -2
  137. app/design/adminhtml/default/default/template/customer/tab/cart.phtml +1 -1
  138. app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml +1 -1
  139. app/design/adminhtml/default/default/template/customer/tab/view.phtml +1 -1
  140. app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml +1 -1
  141. app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml +1 -1
  142. app/design/adminhtml/default/default/template/dashboard/graph.phtml +1 -1
  143. app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml +1 -1
  144. app/design/adminhtml/default/default/template/dashboard/grid.phtml +1 -1
  145. app/design/adminhtml/default/default/template/dashboard/index.phtml +1 -1
  146. app/design/adminhtml/default/default/template/dashboard/salebar.phtml +1 -1
  147. app/design/adminhtml/default/default/template/dashboard/searches.phtml +1 -1
  148. app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml +1 -1
  149. app/design/adminhtml/default/default/template/dashboard/totalbar.phtml +1 -1
  150. app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml +1 -1
  151. app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml +1 -1
  152. app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml +1 -1
  153. app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml +1 -1
  154. app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml +1 -1
  155. app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml +3 -3
  156. app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml +3 -3
  157. app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml +3 -3
  158. app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml +1 -1
  159. app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml +1 -1
  160. app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml +1 -1
  161. app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml +1 -1
  162. app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml +1 -1
  163. app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml +1 -1
  164. app/design/adminhtml/default/default/template/eav/attribute/options.phtml +224 -0
  165. app/design/adminhtml/default/default/template/email/order/items.phtml +1 -1
  166. app/design/adminhtml/default/default/template/empty.phtml +1 -1
  167. app/design/adminhtml/default/default/template/example.phtml +1 -1
  168. app/design/adminhtml/default/default/template/forgotpassword.phtml +1 -1
  169. app/design/adminhtml/default/default/template/formkey.phtml +1 -1
  170. app/design/adminhtml/default/default/template/giftmessage/form.phtml +1 -1
  171. app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml +1 -1
  172. app/design/adminhtml/default/default/template/giftmessage/helper.phtml +5 -5
  173. app/design/adminhtml/default/default/template/giftmessage/popup.phtml +1 -1
  174. app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml +1 -1
  175. app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml +1 -1
  176. app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml +1 -1
  177. app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml +1 -1
  178. app/design/adminhtml/default/default/template/googlebase/captcha.phtml +1 -1
  179. app/design/adminhtml/default/default/template/googlebase/items.phtml +1 -1
  180. app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml +1 -1
  181. app/design/adminhtml/default/default/template/importexport/busy.phtml +1 -1
  182. app/design/adminhtml/default/default/template/importexport/export/form/after.phtml +1 -1
  183. app/design/adminhtml/default/default/template/importexport/export/form/before.phtml +1 -1
  184. app/design/adminhtml/default/default/template/importexport/import/form/after.phtml +1 -1
  185. app/design/adminhtml/default/default/template/importexport/import/form/before.phtml +9 -2
  186. app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml +1 -1
  187. app/design/adminhtml/default/default/template/index/notifications.phtml +1 -1
  188. app/design/adminhtml/default/default/template/login.phtml +5 -3
  189. app/design/adminhtml/default/default/template/media/editor.phtml +1 -1
  190. app/design/adminhtml/default/default/template/media/uploader.phtml +1 -1
  191. app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml +1 -1
  192. app/design/adminhtml/default/default/template/newsletter/preview/store.phtml +1 -1
  193. app/design/adminhtml/default/default/template/newsletter/problem/list.phtml +1 -1
  194. app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml +1 -1
  195. app/design/adminhtml/default/default/template/newsletter/queue/list.phtml +1 -1
  196. app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml +1 -1
  197. app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml +1 -1
  198. app/design/adminhtml/default/default/template/newsletter/template/edit.phtml +1 -1
  199. app/design/adminhtml/default/default/template/newsletter/template/list.phtml +1 -1
  200. app/design/adminhtml/default/default/template/newsletter/template/preview.phtml +1 -1
  201. app/design/adminhtml/default/default/template/notification/baseurl.phtml +1 -1
  202. app/design/adminhtml/default/default/template/notification/security.phtml +1 -1
  203. app/design/adminhtml/default/default/template/notification/survey.phtml +1 -1
  204. app/design/adminhtml/default/default/template/notification/toolbar.phtml +1 -1
  205. app/design/adminhtml/default/default/template/notification/window.phtml +1 -1
  206. app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml +1 -1
  207. app/design/adminhtml/default/default/template/oauth/authorize/button.phtml +1 -1
  208. app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml +1 -1
  209. app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml +1 -1
  210. app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml +1 -1
  211. app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml +1 -1
  212. app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml +1 -1
  213. app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml +1 -1
  214. app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml +1 -1
  215. app/design/adminhtml/default/default/template/overlay_popup.phtml +1 -1
  216. app/design/adminhtml/default/default/template/page.phtml +1 -1
  217. app/design/adminhtml/default/default/template/page/footer.phtml +1 -1
  218. app/design/adminhtml/default/default/template/page/header.phtml +1 -1
  219. app/design/adminhtml/default/default/template/page/js/calendar.phtml +1 -1
  220. app/design/adminhtml/default/default/template/page/js/translate.phtml +1 -1
  221. app/design/adminhtml/default/default/template/page/menu.phtml +1 -1
  222. app/design/adminhtml/default/default/template/page/notices.phtml +1 -1
  223. app/design/adminhtml/default/default/template/pagecache/cache/additional.phtml +1 -1
  224. app/design/adminhtml/default/default/template/paygate/form/cc.phtml +1 -1
  225. app/design/adminhtml/default/default/template/paygate/info/cc.phtml +2 -2
  226. app/design/adminhtml/default/default/template/paygate/info/pdf.phtml +2 -2
  227. app/design/adminhtml/default/default/template/payment/form/cc.phtml +1 -1
  228. app/design/adminhtml/default/default/template/payment/form/ccsave.phtml +1 -1
  229. app/design/adminhtml/default/default/template/payment/form/checkmo.phtml +1 -1
  230. app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml +1 -1
  231. app/design/adminhtml/default/default/template/payment/info/banktransfer.phtml +1 -1
  232. app/design/adminhtml/default/default/template/payment/info/checkmo.phtml +4 -4
  233. app/design/adminhtml/default/default/template/payment/info/default.phtml +2 -2
  234. app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml +4 -4
  235. app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml +2 -2
  236. app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml +2 -2
  237. app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml +3 -3
  238. app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml +1 -1
  239. app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml +1 -1
  240. app/design/adminhtml/default/default/template/paypal/system/config/fieldset/hint.phtml +1 -1
  241. app/design/adminhtml/default/default/template/paypal/system/config/fieldset/store.phtml +1 -1
  242. app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/advanced.phtml +1 -1
  243. app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/info.phtml +1 -1
  244. app/design/adminhtml/default/default/template/permissions/roleinfo.phtml +1 -1
  245. app/design/adminhtml/default/default/template/permissions/roles.phtml +1 -1
  246. app/design/adminhtml/default/default/template/permissions/rolesedit.phtml +1 -1
  247. app/design/adminhtml/default/default/template/permissions/rolesusers.phtml +1 -1
  248. app/design/adminhtml/default/default/template/permissions/userinfo.phtml +1 -1
  249. app/design/adminhtml/default/default/template/permissions/usernroles.phtml +1 -1
  250. app/design/adminhtml/default/default/template/permissions/userroles.phtml +1 -1
  251. app/design/adminhtml/default/default/template/permissions/users.phtml +1 -1
  252. app/design/adminhtml/default/default/template/poll/answers/list.phtml +1 -1
  253. app/design/adminhtml/default/default/template/popup.phtml +1 -1
  254. app/design/adminhtml/default/default/template/promo/fieldset.phtml +1 -1
  255. app/design/adminhtml/default/default/template/promo/form.phtml +1 -1
  256. app/design/adminhtml/default/default/template/promo/js.phtml +1 -1
  257. app/design/adminhtml/default/default/template/promo/salesrulejs.phtml +12 -1
  258. app/design/adminhtml/default/default/template/rating/detailed.phtml +1 -1
  259. app/design/adminhtml/default/default/template/rating/options.phtml +1 -1
  260. app/design/adminhtml/default/default/template/rating/stars/detailed.phtml +1 -1
  261. app/design/adminhtml/default/default/template/rating/stars/summary.phtml +1 -1
  262. app/design/adminhtml/default/default/template/report/grid.phtml +1 -1
  263. app/design/adminhtml/default/default/template/report/grid/container.phtml +1 -1
  264. app/design/adminhtml/default/default/template/report/refresh/statistics.phtml +1 -1
  265. app/design/adminhtml/default/default/template/report/store/switcher.phtml +1 -1
  266. app/design/adminhtml/default/default/template/report/store/switcher/enhanced.phtml +1 -1
  267. app/design/adminhtml/default/default/template/report/wishlist.phtml +1 -1
  268. app/design/adminhtml/default/default/template/resetforgottenpassword.phtml +7 -7
  269. app/design/adminhtml/default/default/template/review/add.phtml +1 -1
  270. app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml +1 -1
  271. app/design/adminhtml/default/default/template/sales/billing/agreement/view/form.phtml +1 -1
  272. app/design/adminhtml/default/default/template/sales/billing/agreement/view/tab/info.phtml +1 -1
  273. app/design/adminhtml/default/default/template/sales/items/column/name.phtml +4 -4
  274. app/design/adminhtml/default/default/template/sales/items/column/qty.phtml +1 -1
  275. app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml +4 -4
  276. app/design/adminhtml/default/default/template/sales/order/address/form.phtml +1 -1
  277. app/design/adminhtml/default/default/template/sales/order/comments/view.phtml +1 -1
  278. app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml +1 -1
  279. app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml +3 -3
  280. app/design/adminhtml/default/default/template/sales/order/create/comment.phtml +1 -1
  281. app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml +1 -1
  282. app/design/adminhtml/default/default/template/sales/order/create/data.phtml +1 -1
  283. app/design/adminhtml/default/default/template/sales/order/create/form.phtml +1 -1
  284. app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml +1 -1
  285. app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml +2 -2
  286. app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml +1 -1
  287. app/design/adminhtml/default/default/template/sales/order/create/items.phtml +1 -1
  288. app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml +16 -9
  289. app/design/adminhtml/default/default/template/sales/order/create/js.phtml +1 -1
  290. app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml +1 -1
  291. app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml +1 -1
  292. app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml +1 -1
  293. app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml +2 -2
  294. app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml +1 -1
  295. app/design/adminhtml/default/default/template/sales/order/create/totals.phtml +1 -1
  296. app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml +1 -1
  297. app/design/adminhtml/default/default/template/sales/order/create/totals/grandtotal.phtml +1 -1
  298. app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml +1 -1
  299. app/design/adminhtml/default/default/template/sales/order/create/totals/subtotal.phtml +1 -1
  300. app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml +1 -1
  301. app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml +1 -1
  302. app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml +1 -1
  303. app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml +1 -1
  304. app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml +1 -1
  305. app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml +1 -1
  306. app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml +1 -1
  307. app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml +1 -1
  308. app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml +1 -1
  309. app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml +1 -1
  310. app/design/adminhtml/default/default/template/sales/order/giftoptions.phtml +1 -1
  311. app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml +10 -8
  312. app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml +1 -1
  313. app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml +1 -1
  314. app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml +1 -1
  315. app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml +1 -1
  316. app/design/adminhtml/default/default/template/sales/order/invoice/view/form.phtml +1 -1
  317. app/design/adminhtml/default/default/template/sales/order/invoice/view/items.phtml +1 -1
  318. app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml +1 -1
  319. app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml +1 -1
  320. app/design/adminhtml/default/default/template/sales/order/shipment/create/form.phtml +1 -1
  321. app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml +1 -1
  322. app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml +1 -1
  323. app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml +1 -1
  324. app/design/adminhtml/default/default/template/sales/order/shipment/create/tracking.phtml +1 -1
  325. app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml +1 -1
  326. app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml +1 -1
  327. app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml +1 -1
  328. app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml +1 -1
  329. app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml +1 -1
  330. app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml +1 -1
  331. app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml +1 -1
  332. app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml +1 -1
  333. app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml +1 -1
  334. app/design/adminhtml/default/default/template/sales/order/totalbar.phtml +1 -1
  335. app/design/adminhtml/default/default/template/sales/order/totals.phtml +1 -1
  336. app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml +1 -1
  337. app/design/adminhtml/default/default/template/sales/order/totals/due.phtml +1 -1
  338. app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml +1 -1
  339. app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml +1 -1
  340. app/design/adminhtml/default/default/template/sales/order/totals/item.phtml +1 -1
  341. app/design/adminhtml/default/default/template/sales/order/totals/main.phtml +1 -1
  342. app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml +1 -1
  343. app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml +1 -1
  344. app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml +1 -1
  345. app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml +1 -1
  346. app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml +1 -1
  347. app/design/adminhtml/default/default/template/sales/order/view/form.phtml +1 -1
  348. app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml +4 -4
  349. app/design/adminhtml/default/default/template/sales/order/view/history.phtml +1 -1
  350. app/design/adminhtml/default/default/template/sales/order/view/info.phtml +3 -3
  351. app/design/adminhtml/default/default/template/sales/order/view/items.phtml +1 -1
  352. app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml +1 -1
  353. app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml +1 -1
  354. app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml +1 -1
  355. app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml +1 -1
  356. app/design/adminhtml/default/default/template/sales/payment/form/billing/agreement.phtml +1 -1
  357. app/design/adminhtml/default/default/template/sales/recurring/profile/view.phtml +1 -1
  358. app/design/adminhtml/default/default/template/sales/recurring/profile/view/info.phtml +1 -1
  359. app/design/adminhtml/default/default/template/sales/transactions/detail.phtml +1 -1
  360. app/design/adminhtml/default/default/template/store/switcher.phtml +1 -1
  361. app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml +1 -1
  362. app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml +1 -1
  363. app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml +1 -1
  364. app/design/adminhtml/default/default/template/system/autocomplete.phtml +3 -3
  365. app/design/adminhtml/default/default/template/system/cache/additional.phtml +1 -1
  366. app/design/adminhtml/default/default/template/system/cache/edit.phtml +1 -1
  367. app/design/adminhtml/default/default/template/system/cache/notifications.phtml +1 -1
  368. app/design/adminhtml/default/default/template/system/config/edit.phtml +1 -1
  369. app/design/adminhtml/default/default/template/system/config/form/field/array.phtml +1 -1
  370. app/design/adminhtml/default/default/template/system/config/js.phtml +1 -1
  371. app/design/adminhtml/default/default/template/system/config/switcher.phtml +1 -1
  372. app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml +1 -1
  373. app/design/adminhtml/default/default/template/system/config/tabs.phtml +1 -1
  374. app/design/adminhtml/default/default/template/system/convert/profile/process.phtml +1 -1
  375. app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml +1 -1
  376. app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml +1 -1
  377. app/design/adminhtml/default/default/template/system/currency/rate/services.phtml +1 -1
  378. app/design/adminhtml/default/default/template/system/currency/rates.phtml +1 -1
  379. app/design/adminhtml/default/default/template/system/design/edit.phtml +1 -1
  380. app/design/adminhtml/default/default/template/system/design/index.phtml +1 -1
  381. app/design/adminhtml/default/default/template/system/email/template/edit.phtml +1 -1
  382. app/design/adminhtml/default/default/template/system/email/template/list.phtml +1 -1
  383. app/design/adminhtml/default/default/template/system/email/template/preview.phtml +1 -1
  384. app/design/adminhtml/default/default/template/system/info.phtml +1 -1
  385. app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml +1 -1
  386. app/design/adminhtml/default/default/template/system/shipping/ups.phtml +2 -1
  387. app/design/adminhtml/default/default/template/system/variable/js.phtml +1 -1
  388. app/design/adminhtml/default/default/template/tag/edit/container.phtml +1 -1
  389. app/design/adminhtml/default/default/template/tag/index.phtml +1 -1
  390. app/design/adminhtml/default/default/template/tax/class/page/edit.phtml +1 -1
  391. app/design/adminhtml/default/default/template/tax/importExport.phtml +1 -1
  392. app/design/adminhtml/default/default/template/tax/notifications.phtml +52 -0
  393. app/design/adminhtml/default/default/template/tax/rate/form.phtml +1 -1
  394. app/design/adminhtml/default/default/template/tax/rate/title.phtml +1 -1
  395. app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml +1 -1
  396. app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml +1 -1
  397. app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml +1 -1
  398. app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml +1 -1
  399. app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml +1 -1
  400. app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml +1 -1
  401. app/design/adminhtml/default/default/template/urlrewrite/categories.phtml +1 -1
  402. app/design/adminhtml/default/default/template/urlrewrite/edit.phtml +1 -1
  403. app/design/adminhtml/default/default/template/urlrewrite/selector.phtml +1 -1
  404. app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml +1 -1
  405. app/design/adminhtml/default/default/template/weee/renderer/tax.phtml +1 -1
  406. app/design/adminhtml/default/default/template/widget/accordion.phtml +1 -1
  407. app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml +4 -4
  408. app/design/adminhtml/default/default/template/widget/form.phtml +1 -1
  409. app/design/adminhtml/default/default/template/widget/form/container.phtml +1 -1
  410. app/design/adminhtml/default/default/template/widget/form/element.phtml +1 -1
  411. app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml +1 -1
  412. app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml +1 -1
  413. app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml +1 -1
  414. app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml +1 -1
  415. app/design/adminhtml/default/default/template/widget/grid.phtml +1 -1
  416. app/design/adminhtml/default/default/template/widget/grid/container.phtml +1 -1
  417. app/design/adminhtml/default/default/template/widget/grid/massaction.phtml +1 -1
  418. app/design/adminhtml/default/default/template/widget/grid/serializer.phtml +1 -1
  419. app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml +1 -1
  420. app/design/adminhtml/default/default/template/widget/instance/js.phtml +1 -1
  421. app/design/adminhtml/default/default/template/widget/tabs.phtml +1 -1
  422. app/design/adminhtml/default/default/template/widget/tabshoriz.phtml +1 -1
  423. app/design/adminhtml/default/default/template/widget/tabsleft.phtml +1 -1
  424. app/design/adminhtml/default/default/template/widget/view/container.phtml +1 -1
  425. package.xml +6 -6
app/design/adminhtml/default/default/layout/admin.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/adminnotification.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/api2.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/authorizenet.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/adminhtml/default/default/layout/bundle.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/captcha.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/adminhtml/default/default/layout/catalog.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/cms.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/connect.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/currencysymbol.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/customer.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/dataflow.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/downloadable.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/giftmessage.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/index.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
@@ -42,4 +42,10 @@
42
  </block>
43
  </reference>
44
  </adminhtml_process_edit>
 
 
 
 
 
 
45
  </layout>
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
42
  </block>
43
  </reference>
44
  </adminhtml_process_edit>
45
+
46
+ <adminhtml_process_list>
47
+ <reference name="content">
48
+ <block type="index/adminhtml_process" name="process" />
49
+ </reference>
50
+ </adminhtml_process_list>
51
  </layout>
app/design/adminhtml/default/default/layout/main.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/adminhtml/default/default/layout/newsletter.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/oauth.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/pagecache.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/promo.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/report.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/rss.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/sales.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/search.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/tag.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/tax.xml ADDED
@@ -0,0 +1,34 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?xml version="1.0"?>
2
+ <!--
3
+ /**
4
+ * Magento
5
+ *
6
+ * NOTICE OF LICENSE
7
+ *
8
+ * This source file is subject to the Academic Free License (AFL 3.0)
9
+ * that is bundled with this package in the file LICENSE_AFL.txt.
10
+ * It is also available through the world-wide-web at this URL:
11
+ * http://opensource.org/licenses/afl-3.0.php
12
+ * If you did not receive a copy of the license and are unable to
13
+ * obtain it through the world-wide-web, please send an email
14
+ * to license@magentocommerce.com so we can send you a copy immediately.
15
+ *
16
+ * DISCLAIMER
17
+ *
18
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
19
+ * versions in the future. If you wish to customize Magento for your
20
+ * needs please refer to http://www.magentocommerce.com for more information.
21
+ *
22
+ * @category design
23
+ * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
+ */
27
+ -->
28
+ <layout>
29
+ <default>
30
+ <reference name="notifications">
31
+ <block type="tax/adminhtml_notifications" name="tax_notifications" template="tax/notifications.phtml"></block>
32
+ </reference>
33
+ </default>
34
+ </layout>
app/design/adminhtml/default/default/layout/widget.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/template/access_denied.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api/roleinfo.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /** @var $this Mage_Adminhtml_Block_Api_Tab_Roleinfo */
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /** @var $this Mage_Adminhtml_Block_Api_Tab_Roleinfo */
app/design/adminhtml/default/default/template/api/roles.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api/rolesedit.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api/rolesusers.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api/userinfo.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api/usernroles.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api/userroles.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api/users.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /** @var $this Mage_Api2_Block_Adminhtml_Attribute_Buttons */
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /** @var $this Mage_Api2_Block_Adminhtml_Attribute_Buttons */
app/design/adminhtml/default/default/template/api2/attribute/resource.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api2/role/buttons.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/adminhtml/default/default/template/backup/left.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/backup/list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -71,6 +71,15 @@ $('product_bundle_container').select('input', 'select', 'textarea', 'button').ea
71
  }
72
  });
73
  <?php endif; ?>
 
 
 
 
 
 
 
 
 
74
  </script>
75
 
76
  <div><input type="hidden" name="affect_bundle_product_selections" value="1" /></div>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
71
  }
72
  });
73
  <?php endif; ?>
74
+ Validation.add('validate-greater-zero-based-on-option', '<?php echo $this->__('Please enter a number greater 0 in this field.') ?>', function(v, el) {
75
+ var optionType = $(el).up('div.grid').previous('table.option-header').select('select.select-product-option-type')[0],
76
+ v = Number(v) || 0;
77
+
78
+ if (optionType && (optionType.value == 'checkbox' || optionType.value == 'multi') && v <= 0) {
79
+ return false;
80
+ }
81
+ return true;
82
+ });
83
  </script>
84
 
85
  <div><input type="hidden" name="affect_bundle_product_selections" value="1" /></div>
app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -66,7 +66,7 @@ var bundleTemplateRow ='<td>' +
66
  '<input type="hidden" id="<?php echo $this->getFieldId(); ?>_{{index}}_price_scope" name="<?php echo $this->getFieldName(); ?>[{{parentIndex}}][{{index}}][default_price_scope]" value="1" />' +
67
  <?php endif; ?>
68
  <?php endif; ?>
69
- '<td><input class="input-text required-entry validate-zero-or-greater" type="text" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][selection_qty]" value="{{selection_qty}}"></td>' +
70
  '<td class="qty-box"><?php echo $this->getQtyTypeSelectHtml() ?></td>' +
71
  '<td><input class="input-text required-entry validate-zero-or-greater" type="text" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][position]" value="{{position}}"></td>' +
72
  '<td class="a-center"><input onclick="bSelection.checkGroup(event)" type="{{option_type}}" class="default" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][is_default]" value="1" {{checked}}></td>' +
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
66
  '<input type="hidden" id="<?php echo $this->getFieldId(); ?>_{{index}}_price_scope" name="<?php echo $this->getFieldName(); ?>[{{parentIndex}}][{{index}}][default_price_scope]" value="1" />' +
67
  <?php endif; ?>
68
  <?php endif; ?>
69
+ '<td><input class="input-text required-entry validate-greater-zero-based-on-option validate-zero-or-greater" type="text" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][selection_qty]" value="{{selection_qty}}"></td>' +
70
  '<td class="qty-box"><?php echo $this->getQtyTypeSelectHtml() ?></td>' +
71
  '<td><input class="input-text required-entry validate-zero-or-greater" type="text" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][position]" value="{{position}}"></td>' +
72
  '<td class="a-center"><input onclick="bSelection.checkGroup(event)" type="{{option_type}}" class="default" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][is_default]" value="1" {{checked}}></td>' +
app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -64,10 +64,10 @@
64
  <?php endif; ?>
65
  <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
66
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
67
- <td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
68
  <div>
69
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
70
- <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
71
  </div>
72
  </td>
73
  <?php else: ?>
@@ -397,7 +397,7 @@
397
  <?php else: ?>
398
  &nbsp;
399
  <?php endif; ?>
400
- <?php echo $this->htmlEscape($_item->getDescription()) ?>
401
  </td>
402
  <td>&nbsp;</td>
403
  <td>&nbsp;</td>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
64
  <?php endif; ?>
65
  <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
66
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
67
+ <td><h5 class="title"><?php echo $this->escapeHtml($_item->getName()) ?></h5>
68
  <div>
69
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
70
+ <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
71
  </div>
72
  </td>
73
  <?php else: ?>
397
  <?php else: ?>
398
  &nbsp;
399
  <?php endif; ?>
400
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
401
  </td>
402
  <td>&nbsp;</td>
403
  <td>&nbsp;</td>
app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -62,10 +62,10 @@
62
  <?php endif; ?>
63
  <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
64
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
65
- <td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
66
  <div>
67
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
68
- <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
69
  </div>
70
  </td>
71
  <?php else: ?>
@@ -329,7 +329,7 @@
329
  <?php endforeach; ?>
330
  </dl>
331
  <?php endif; ?>
332
- <?php echo $this->htmlEscape($this->getItem()->getDescription()) ?>
333
  </td>
334
  <td>&nbsp;</td>
335
  <td>&nbsp;</td>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
62
  <?php endif; ?>
63
  <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
64
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
65
+ <td><h5 class="title"><?php echo $this->escapeHtml($_item->getName()) ?></h5>
66
  <div>
67
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
68
+ <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
69
  </div>
70
  </td>
71
  <?php else: ?>
329
  <?php endforeach; ?>
330
  </dl>
331
  <?php endif; ?>
332
+ <?php echo $this->escapeHtml($this->getItem()->getDescription()) ?>
333
  </td>
334
  <td>&nbsp;</td>
335
  <td>&nbsp;</td>
app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -63,10 +63,10 @@
63
  <?php endif; ?>
64
  <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
65
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
66
- <td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
67
  <div>
68
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
69
- <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
70
  </div>
71
  </td>
72
  <?php else: ?>
@@ -385,7 +385,7 @@
385
  <?php else: ?>
386
  &nbsp;
387
  <?php endif; ?>
388
- <?php echo $this->htmlEscape($_item->getDescription()) ?>
389
  </td>
390
  <td>&nbsp;</td>
391
  <td>&nbsp;</td>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
63
  <?php endif; ?>
64
  <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
65
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
66
+ <td><h5 class="title"><?php echo $this->escapeHtml($_item->getName()) ?></h5>
67
  <div>
68
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
69
+ <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
70
  </div>
71
  </td>
72
  <?php else: ?>
385
  <?php else: ?>
386
  &nbsp;
387
  <?php endif; ?>
388
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
389
  </td>
390
  <td>&nbsp;</td>
391
  <td>&nbsp;</td>
app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -62,10 +62,10 @@
62
  <?php endif; ?>
63
  <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
64
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
65
- <td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
66
  <div>
67
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
68
- <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
69
  </div>
70
  <?php else: ?>
71
  <td><div class="option-value"><?php echo $this->getValueHtml($_item)?></div></td>
@@ -328,7 +328,7 @@
328
  <?php endforeach; ?>
329
  </dl>
330
  <?php endif; ?>
331
- <?php echo $this->htmlEscape($this->getItem()->getDescription()) ?>
332
  </td>
333
  <td>&nbsp;</td>
334
  <td>&nbsp;</td>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
62
  <?php endif; ?>
63
  <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
64
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
65
+ <td><h5 class="title"><?php echo $this->escapeHtml($_item->getName()) ?></h5>
66
  <div>
67
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
68
+ <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
69
  </div>
70
  <?php else: ?>
71
  <td><div class="option-value"><?php echo $this->getValueHtml($_item)?></div></td>
328
  <?php endforeach; ?>
329
  </dl>
330
  <?php endif; ?>
331
+ <?php echo $this->escapeHtml($this->getItem()->getDescription()) ?>
332
  </td>
333
  <td>&nbsp;</td>
334
  <td>&nbsp;</td>
app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -67,11 +67,11 @@
67
  <?php if (!$_item->getParentItem()): ?>
68
  <td>
69
  <h5 class="title">
70
- <span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $this->htmlEscape($_item->getName()) ?></span>
71
  </h5>
72
  <div>
73
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
74
- <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
75
  </div>
76
  </td>
77
  <?php else: ?>
@@ -400,7 +400,7 @@
400
  <?php else: ?>
401
  &nbsp;
402
  <?php endif; ?>
403
- <?php echo $this->htmlEscape($_item->getDescription()) ?>
404
  </td>
405
  <td>&nbsp;</td>
406
  <td>&nbsp;</td>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
67
  <?php if (!$_item->getParentItem()): ?>
68
  <td>
69
  <h5 class="title">
70
+ <span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $this->escapeHtml($_item->getName()) ?></span>
71
  </h5>
72
  <div>
73
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
74
+ <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
75
  </div>
76
  </td>
77
  <?php else: ?>
400
  <?php else: ?>
401
  &nbsp;
402
  <?php endif; ?>
403
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
404
  </td>
405
  <td>&nbsp;</td>
406
  <td>&nbsp;</td>
app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -58,10 +58,10 @@
58
  <?php endif; ?>
59
  <tr class="<?php echo (++$_index==$_count && !$_showlastRow)?'border':'' ?>">
60
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
61
- <td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
62
  <div>
63
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
64
- <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
65
  </div>
66
  </td>
67
  <?php else: ?>
@@ -110,7 +110,7 @@
110
  <?php else: ?>
111
  &nbsp;
112
  <?php endif; ?>
113
- <?php echo $this->htmlEscape($_item->getDescription()) ?>
114
  </td>
115
  <td>&nbsp;</td>
116
  <td class="last">&nbsp;</td>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
58
  <?php endif; ?>
59
  <tr class="<?php echo (++$_index==$_count && !$_showlastRow)?'border':'' ?>">
60
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
61
+ <td><h5 class="title"><?php echo $this->escapeHtml($_item->getName()) ?></h5>
62
  <div>
63
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
64
+ <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
65
  </div>
66
  </td>
67
  <?php else: ?>
110
  <?php else: ?>
111
  &nbsp;
112
  <?php endif; ?>
113
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
114
  </td>
115
  <td>&nbsp;</td>
116
  <td class="last">&nbsp;</td>
app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -59,10 +59,10 @@
59
  <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
60
  <?php if (!$_item->getParentItem()): ?>
61
  <td>
62
- <h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
63
  <div>
64
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
65
- <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($_item->getSku()))); ?>
66
  </div>
67
  </td>
68
  <?php else: ?>
@@ -108,7 +108,7 @@
108
  <?php endforeach; ?>
109
  </dl>
110
  <?php endif; ?>
111
- <?php echo $this->htmlEscape($_item->getDescription()) ?>
112
  </td>
113
  <td class="last">&nbsp;</td>
114
  </tr>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
59
  <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
60
  <?php if (!$_item->getParentItem()): ?>
61
  <td>
62
+ <h5 class="title"><?php echo $this->escapeHtml($_item->getName()) ?></h5>
63
  <div>
64
  <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong>
65
+ <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->escapeHtml($_item->getSku()))); ?>
66
  </div>
67
  </td>
68
  <?php else: ?>
108
  <?php endforeach; ?>
109
  </dl>
110
  <?php endif; ?>
111
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
112
  </td>
113
  <td class="last">&nbsp;</td>
114
  </tr>
app/design/adminhtml/default/default/template/captcha/zend.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/category/edit.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml CHANGED
@@ -20,13 +20,13 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
 
28
  <div class="content-header">
29
- <h3 class="icon-head head-categories"><?php echo $this->htmlEscape($this->getHeader()) . ($this->getCategoryId() ? ' (' . Mage::helper('catalog')->__('ID: %s', $this->getCategoryId()) . ')' : '') ?></h3>
30
  <p class="content-buttons form-buttons">
31
  <?php echo $this->getResetButtonHtml() ?>
32
  <?php if($this->getCategoryId()): ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
 
28
  <div class="content-header">
29
+ <h3 class="icon-head head-categories"><?php echo $this->escapeHtml($this->getHeader()) . ($this->getCategoryId() ? ' (' . Mage::helper('catalog')->__('ID: %s', $this->getCategoryId()) . ')' : '') ?></h3>
30
  <p class="content-buttons form-buttons">
31
  <?php echo $this->getResetButtonHtml() ?>
32
  <?php if($this->getCategoryId()): ?>
app/design/adminhtml/default/default/template/catalog/category/tree.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -31,6 +31,10 @@
31
  ?>
32
  <?php $_element = $this->getElement() ?>
33
  <?php $this->checkFieldDisable() ?>
 
 
 
 
34
 
35
  <?php if ($_element->getType()=='hidden'): ?>
36
  <tr>
@@ -48,7 +52,7 @@
48
  <td class="scope-label"><span class="nobr"><?php echo $this->getScopeLabel() ?></span></td>
49
  <?php if ($this->canDisplayUseDefault()): ?>
50
  <td class="value use-default">
51
- <input <?php if($_element->getReadonly()):?> disabled="disabled"<?php endif; ?> type="checkbox" name="use_default[]" id="<?php echo $_element->getHtmlId() ?>_default"<?php if ($this->usedDefault()): ?> checked="checked"<?php endif; ?> onclick="toggleValueElements(this, this.parentNode.parentNode)" value="<?php echo $this->getAttributeCode() ?>"/>
52
  <label for="<?php echo $_element->getHtmlId() ?>_default" class="normal"><?php echo $this->__('Use Default Value') ?></label>
53
  </td>
54
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
31
  ?>
32
  <?php $_element = $this->getElement() ?>
33
  <?php $this->checkFieldDisable() ?>
34
+ <?php
35
+ $elementToggleCode = $_element->getToggleCode() ? $_element->getToggleCode()
36
+ : 'toggleValueElements(this, this.parentNode.parentNode)';
37
+ ?>
38
 
39
  <?php if ($_element->getType()=='hidden'): ?>
40
  <tr>
52
  <td class="scope-label"><span class="nobr"><?php echo $this->getScopeLabel() ?></span></td>
53
  <?php if ($this->canDisplayUseDefault()): ?>
54
  <td class="value use-default">
55
+ <input <?php if($_element->getReadonly()):?> disabled="disabled"<?php endif; ?> type="checkbox" name="use_default[]" id="<?php echo $_element->getHtmlId() ?>_default"<?php if ($this->usedDefault()): ?> checked="checked"<?php endif; ?> onclick="<?php echo $elementToggleCode; ?>" value="<?php echo $this->getAttributeCode() ?>"/>
56
  <label for="<?php echo $_element->getHtmlId() ?>_default" class="normal"><?php echo $this->__('Use Default Value') ?></label>
57
  </td>
58
  <?php endif; ?>
app/design/adminhtml/default/default/template/catalog/product.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -28,6 +28,7 @@
28
  /**
29
  * Attribute options control
30
  *
 
31
  * @see Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tab_Options
32
  */
33
  ?>
@@ -57,7 +58,7 @@
57
  <?php $_labels = $this->getLabelValues() ?>
58
  <?php foreach ($this->getStores() as $_store): ?>
59
  <td>
60
- <input class="input-text<?php if($_store->getId()==0): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php echo $_store->getId() ?>]" value="<?php echo $this->htmlEscape($_labels[$_store->getId()]) ?>"<?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
61
  </td>
62
  <?php endforeach; ?>
63
  </tr>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
28
  /**
29
  * Attribute options control
30
  *
31
+ * @deprecated after 1.7.0.2 The file is moved
32
  * @see Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tab_Options
33
  */
34
  ?>
58
  <?php $_labels = $this->getLabelValues() ?>
59
  <?php foreach ($this->getStores() as $_store): ?>
60
  <td>
61
+ <input class="input-text<?php if($_store->getId()==0): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php echo $_store->getId() ?>]" value="<?php echo $this->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
62
  </td>
63
  <?php endforeach; ?>
64
  </tr>
app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml CHANGED
@@ -20,14 +20,14 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
  <div class="content-header">
28
  <table cellspacing="0">
29
  <tr>
30
- <td style="width:50%;"><h3 class="icon-head head-product-attribute-sets"><?php echo $this->htmlEscape($this->_getHeader()) ?></h3></td>
31
  <td class="form-buttons">
32
  <?php echo $this->getBackButtonHtml() ?>
33
  <?php echo $this->getResetButtonHtml() ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
  <div class="content-header">
28
  <table cellspacing="0">
29
  <tr>
30
+ <td style="width:50%;"><h3 class="icon-head head-product-attribute-sets"><?php echo $this->escapeHtml($this->_getHeader()) ?></h3></td>
31
  <td class="form-buttons">
32
  <?php echo $this->getBackButtonHtml() ?>
33
  <?php echo $this->getResetButtonHtml() ?>
app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -74,7 +74,7 @@
74
  //]]>
75
  </script>
76
 
77
- <dt><label <?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->htmlEscape($_option->getTitle()) ?></label>
78
  <?php echo $this->getFormatedPrice() ?></dt>
79
  <dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
80
  <?php if ($_fileExists): ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
74
  //]]>
75
  </script>
76
 
77
+ <dt><label <?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label>
78
  <?php echo $this->getFormatedPrice() ?></dt>
79
  <dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
80
  <?php if ($_fileExists): ?>
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>