Mage_Core_Adminhtml - Version 1.8.0.0

Version Notes

1.8.0.0

Download this release

Release Info

Developer Magento Core Team
Extension Mage_Core_Adminhtml
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 (1039) hide show
  1. app/code/core/Mage/Adminhtml/Block/Abstract.php +1 -1
  2. app/code/core/Mage/Adminhtml/Block/Api/Buttons.php +1 -1
  3. app/code/core/Mage/Adminhtml/Block/Api/Editroles.php +1 -1
  4. app/code/core/Mage/Adminhtml/Block/Api/Edituser.php +1 -1
  5. app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php +1 -1
  6. app/code/core/Mage/Adminhtml/Block/Api/Role.php +1 -1
  7. app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php +1 -1
  8. app/code/core/Mage/Adminhtml/Block/Api/Roles.php +1 -1
  9. app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php +1 -1
  10. app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php +1 -1
  11. app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php +1 -1
  12. app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php +1 -1
  13. app/code/core/Mage/Adminhtml/Block/Api/User.php +1 -1
  14. app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php +2 -2
  15. app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php +1 -1
  16. app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php +1 -1
  17. app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php +1 -1
  18. app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php +1 -1
  19. app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php +1 -1
  20. app/code/core/Mage/Adminhtml/Block/Api/Users.php +1 -1
  21. app/code/core/Mage/Adminhtml/Block/Backup.php +1 -1
  22. app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php +1 -1
  23. app/code/core/Mage/Adminhtml/Block/Backup/Grid.php +1 -1
  24. app/code/core/Mage/Adminhtml/Block/Cache.php +1 -1
  25. app/code/core/Mage/Adminhtml/Block/Cache/Additional.php +1 -1
  26. app/code/core/Mage/Adminhtml/Block/Cache/Grid.php +1 -1
  27. app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php +1 -1
  28. app/code/core/Mage/Adminhtml/Block/Catalog.php +1 -1
  29. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php +1 -1
  30. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php +2 -2
  31. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php +1 -1
  32. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php +1 -1
  33. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php +1 -1
  34. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php +24 -8
  35. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php +24 -9
  36. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php +25 -10
  37. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php +6 -7
  38. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php +1 -1
  39. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php +2 -2
  40. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php +1 -1
  41. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php +1 -1
  42. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +12 -5
  43. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php +1 -1
  44. app/code/core/Mage/Adminhtml/Block/Catalog/Form.php +1 -1
  45. app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php +1 -1
  46. app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php +1 -1
  47. app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php +1 -1
  48. app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php +15 -2
  49. app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php +2 -2
  50. app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php +1 -1
  51. app/code/core/Mage/Adminhtml/Block/Catalog/Product.php +1 -1
  52. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php +1 -1
  53. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php +2 -2
  54. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php +1 -1
  55. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php +1 -1
  56. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php +1 -1
  57. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php +1 -1
  58. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php +1 -1
  59. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php +1 -1
  60. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php +1 -1
  61. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php +1 -1
  62. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php +1 -1
  63. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php +1 -1
  64. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php +1 -1
  65. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php +1 -1
  66. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php +1 -1
  67. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php +1 -1
  68. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php +1 -1
  69. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php +1 -1
  70. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php +1 -1
  71. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php +1 -1
  72. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php +1 -1
  73. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php +1 -1
  74. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php +1 -1
  75. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php +1 -1
  76. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php +1 -1
  77. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php +1 -1
  78. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php +1 -1
  79. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php +1 -1
  80. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php +1 -1
  81. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php +1 -1
  82. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php +10 -5
  83. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php +1 -1
  84. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php +1 -1
  85. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php +1 -1
  86. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php +1 -1
  87. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php +1 -1
  88. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php +1 -1
  89. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php +1 -1
  90. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php +1 -1
  91. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php +1 -1
  92. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php +1 -1
  93. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php +1 -1
  94. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php +1 -1
  95. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php +1 -1
  96. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php +1 -1
  97. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php +1 -1
  98. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php +1 -1
  99. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php +5 -5
  100. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php +1 -1
  101. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php +1 -1
  102. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php +1 -1
  103. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php +1 -1
  104. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php +1 -1
  105. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php +1 -1
  106. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php +1 -1
  107. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php +1 -1
  108. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php +1 -1
  109. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php +1 -1
  110. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php +1 -1
  111. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php +1 -1
  112. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php +1 -1
  113. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php +1 -1
  114. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php +94 -2
  115. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php +1 -1
  116. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php +1 -1
  117. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php +1 -1
  118. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php +1 -1
  119. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php +1 -1
  120. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php +1 -1
  121. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php +1 -1
  122. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php +1 -1
  123. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php +1 -1
  124. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php +1 -1
  125. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php +1 -1
  126. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php +1 -1
  127. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php +1 -1
  128. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php +1 -1
  129. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php +1 -1
  130. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php +1 -1
  131. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php +1 -1
  132. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php +1 -1
  133. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php +1 -1
  134. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php +1 -1
  135. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php +1 -1
  136. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php +1 -1
  137. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php +1 -1
  138. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php +1 -1
  139. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php +1 -1
  140. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Price.php +1 -1
  141. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php +1 -1
  142. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php +1 -1
  143. app/code/core/Mage/Adminhtml/Block/Catalog/Search.php +1 -1
  144. app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php +2 -2
  145. app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php +1 -1
  146. app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php +1 -1
  147. app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php +1 -1
  148. app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php +1 -1
  149. app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php +1 -1
  150. app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php +1 -1
  151. app/code/core/Mage/Adminhtml/Block/Cms/Block.php +1 -1
  152. app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php +2 -2
  153. app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php +1 -1
  154. app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php +1 -1
  155. app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php +1 -1
  156. app/code/core/Mage/Adminhtml/Block/Cms/Page.php +1 -1
  157. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php +2 -2
  158. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php +1 -1
  159. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php +1 -1
  160. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php +5 -3
  161. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php +1 -1
  162. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php +1 -1
  163. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php +1 -1
  164. app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php +1 -1
  165. app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php +1 -1
  166. app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php +1 -1
  167. app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php +1 -1
  168. app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php +1 -1
  169. app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php +1 -1
  170. app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php +1 -1
  171. app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php +1 -1
  172. app/code/core/Mage/Adminhtml/Block/Customer.php +1 -1
  173. app/code/core/Mage/Adminhtml/Block/Customer/Edit.php +2 -2
  174. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php +1 -1
  175. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php +1 -1
  176. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php +30 -18
  177. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php +25 -7
  178. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php +1 -1
  179. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php +1 -1
  180. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php +1 -1
  181. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php +1 -1
  182. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php +1 -1
  183. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php +1 -1
  184. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php +1 -1
  185. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php +1 -1
  186. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php +1 -1
  187. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php +1 -1
  188. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php +1 -1
  189. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php +1 -1
  190. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php +1 -1
  191. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php +11 -2
  192. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php +1 -1
  193. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php +27 -31
  194. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php +1 -1
  195. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php +3 -3
  196. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php +1 -1
  197. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php +1 -1
  198. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php +6 -4
  199. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php +1 -1
  200. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php +1 -1
  201. app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php +1 -1
  202. app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php +1 -1
  203. app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php +1 -1
  204. app/code/core/Mage/Adminhtml/Block/Customer/Grid.php +1 -1
  205. app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php +1 -1
  206. app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php +1 -1
  207. app/code/core/Mage/Adminhtml/Block/Customer/Group.php +1 -1
  208. app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php +2 -2
  209. app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php +1 -1
  210. app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php +1 -1
  211. app/code/core/Mage/Adminhtml/Block/Customer/Online.php +1 -1
  212. app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php +1 -1
  213. app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php +1 -1
  214. app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php +1 -1
  215. app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php +1 -1
  216. app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php +1 -1
  217. app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php +1 -1
  218. app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php +1 -1
  219. app/code/core/Mage/Adminhtml/Block/Dashboard.php +1 -1
  220. app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php +1 -1
  221. app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php +1 -1
  222. app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php +1 -1
  223. app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php +1 -1
  224. app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php +1 -1
  225. app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php +1 -1
  226. app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php +1 -1
  227. app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php +1 -1
  228. app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php +1 -1
  229. app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php +6 -4
  230. app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php +1 -1
  231. app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php +1 -1
  232. app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php +1 -1
  233. app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php +1 -1
  234. app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php +1 -1
  235. app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php +1 -1
  236. app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php +1 -1
  237. app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php +1 -1
  238. app/code/core/Mage/Adminhtml/Block/Denied.php +1 -1
  239. app/code/core/Mage/Adminhtml/Block/Html/Date.php +1 -1
  240. app/code/core/Mage/Adminhtml/Block/Html/Select.php +1 -1
  241. app/code/core/Mage/Adminhtml/Block/Media/Editor.php +1 -1
  242. app/code/core/Mage/Adminhtml/Block/Media/Uploader.php +1 -1
  243. app/code/core/Mage/Adminhtml/Block/Messages.php +1 -1
  244. app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php +1 -1
  245. app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php +1 -1
  246. app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php +1 -1
  247. app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php +1 -1
  248. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php +1 -1
  249. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php +1 -1
  250. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php +1 -1
  251. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php +1 -1
  252. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php +1 -1
  253. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php +1 -1
  254. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php +1 -1
  255. app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php +1 -1
  256. app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php +1 -1
  257. app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php +1 -1
  258. app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php +1 -1
  259. app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php +1 -1
  260. app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php +1 -1
  261. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php +1 -1
  262. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php +1 -1
  263. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php +1 -1
  264. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php +1 -1
  265. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php +1 -1
  266. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php +1 -1
  267. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php +1 -1
  268. app/code/core/Mage/Adminhtml/Block/Notification/Baseurl.php +1 -1
  269. app/code/core/Mage/Adminhtml/Block/Notification/Grid.php +1 -1
  270. app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php +1 -1
  271. app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php +1 -1
  272. app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php +1 -1
  273. app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php +1 -1
  274. app/code/core/Mage/Adminhtml/Block/Notification/Security.php +1 -1
  275. app/code/core/Mage/Adminhtml/Block/Notification/Survey.php +1 -1
  276. app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php +1 -1
  277. app/code/core/Mage/Adminhtml/Block/Notification/Window.php +1 -1
  278. app/code/core/Mage/Adminhtml/Block/Page.php +1 -1
  279. app/code/core/Mage/Adminhtml/Block/Page/Footer.php +1 -1
  280. app/code/core/Mage/Adminhtml/Block/Page/Head.php +1 -1
  281. app/code/core/Mage/Adminhtml/Block/Page/Header.php +1 -1
  282. app/code/core/Mage/Adminhtml/Block/Page/Menu.php +19 -2
  283. app/code/core/Mage/Adminhtml/Block/Page/Notices.php +1 -1
  284. app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php +1 -1
  285. app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php +1 -1
  286. app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php +1 -1
  287. app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php +1 -1
  288. app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php +1 -1
  289. app/code/core/Mage/Adminhtml/Block/Permissions/Role.php +1 -1
  290. app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php +1 -1
  291. app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php +1 -1
  292. app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php +1 -1
  293. app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php +1 -1
  294. app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php +1 -1
  295. app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php +1 -1
  296. app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php +1 -1
  297. app/code/core/Mage/Adminhtml/Block/Permissions/User.php +1 -1
  298. app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php +2 -2
  299. app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php +1 -1
  300. app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php +1 -1
  301. app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php +1 -1
  302. app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php +1 -1
  303. app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php +1 -1
  304. app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php +1 -1
  305. app/code/core/Mage/Adminhtml/Block/Permissions/Users.php +1 -1
  306. app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php +2 -2
  307. app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php +1 -1
  308. app/code/core/Mage/Adminhtml/Block/Poll/Edit.php +2 -2
  309. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php +1 -1
  310. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php +1 -1
  311. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php +1 -1
  312. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php +1 -1
  313. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php +1 -1
  314. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php +1 -1
  315. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php +1 -1
  316. app/code/core/Mage/Adminhtml/Block/Poll/Grid.php +1 -1
  317. app/code/core/Mage/Adminhtml/Block/Poll/Poll.php +1 -1
  318. app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php +1 -1
  319. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php +1 -1
  320. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php +1 -1
  321. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Js.php +1 -1
  322. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php +1 -1
  323. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php +1 -1
  324. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php +1 -1
  325. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php +1 -1
  326. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php +1 -1
  327. app/code/core/Mage/Adminhtml/Block/Promo/Quote.php +1 -1
  328. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php +1 -1
  329. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php +1 -1
  330. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php +1 -1
  331. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php +1 -1
  332. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php +1 -1
  333. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php +1 -1
  334. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php +1 -1
  335. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php +1 -1
  336. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php +1 -1
  337. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php +1 -1
  338. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php +1 -1
  339. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php +1 -1
  340. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php +1 -1
  341. app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php +1 -1
  342. app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php +1 -1
  343. app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php +1 -1
  344. app/code/core/Mage/Adminhtml/Block/Rating/Edit.php +2 -2
  345. app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php +1 -1
  346. app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php +1 -1
  347. app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php +1 -1
  348. app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php +1 -1
  349. app/code/core/Mage/Adminhtml/Block/Rating/Grid.php +1 -1
  350. app/code/core/Mage/Adminhtml/Block/Rating/Rating.php +1 -1
  351. app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php +1 -1
  352. app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php +1 -1
  353. app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php +1 -1
  354. app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php +1 -1
  355. app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php +1 -1
  356. app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php +1 -1
  357. app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php +1 -1
  358. app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php +1 -1
  359. app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php +1 -1
  360. app/code/core/Mage/Adminhtml/Block/Report/Grid.php +1 -1
  361. app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php +1 -1
  362. app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php +1 -1
  363. app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php +1 -1
  364. app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php +1 -1
  365. app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php +1 -1
  366. app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php +1 -1
  367. app/code/core/Mage/Adminhtml/Block/Report/Product.php +1 -1
  368. app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php +1 -1
  369. app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php +1 -1
  370. app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php +1 -1
  371. app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php +1 -1
  372. app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php +1 -1
  373. app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php +1 -1
  374. app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php +1 -1
  375. app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php +1 -1
  376. app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php +1 -1
  377. app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php +1 -1
  378. app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php +1 -1
  379. app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php +1 -1
  380. app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php +1 -1
  381. app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php +1 -1
  382. app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php +1 -1
  383. app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php +1 -1
  384. app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php +1 -1
  385. app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php +1 -1
  386. app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php +1 -1
  387. app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php +1 -1
  388. app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php +1 -1
  389. app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php +1 -1
  390. app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php +1 -1
  391. app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php +1 -1
  392. app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php +1 -1
  393. app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php +1 -1
  394. app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php +1 -1
  395. app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php +1 -1
  396. app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php +1 -1
  397. app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php +1 -1
  398. app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php +1 -1
  399. app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php +1 -1
  400. app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php +1 -1
  401. app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php +1 -1
  402. app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php +1 -1
  403. app/code/core/Mage/Adminhtml/Block/Report/Search.php +1 -1
  404. app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php +1 -1
  405. app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php +1 -1
  406. app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php +1 -1
  407. app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php +1 -1
  408. app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php +1 -1
  409. app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php +1 -1
  410. app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php +1 -1
  411. app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php +1 -1
  412. app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php +1 -1
  413. app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php +2 -7
  414. app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php +1 -1
  415. app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php +1 -1
  416. app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php +1 -1
  417. app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php +5 -10
  418. app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php +1 -3
  419. app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php +1 -1
  420. app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php +1 -1
  421. app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php +2 -2
  422. app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php +1 -1
  423. app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php +1 -1
  424. app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php +1 -1
  425. app/code/core/Mage/Adminhtml/Block/Review/Add.php +1 -1
  426. app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php +2 -7
  427. app/code/core/Mage/Adminhtml/Block/Review/Edit.php +49 -10
  428. app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php +2 -6
  429. app/code/core/Mage/Adminhtml/Block/Review/Grid.php +3 -18
  430. app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php +1 -1
  431. app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php +1 -1
  432. app/code/core/Mage/Adminhtml/Block/Review/Main.php +1 -1
  433. app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php +1 -1
  434. app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php +1 -1
  435. app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php +1 -1
  436. app/code/core/Mage/Adminhtml/Block/Sales.php +1 -1
  437. app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php +1 -1
  438. app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php +1 -1
  439. app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php +1 -1
  440. app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php +1 -1
  441. app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php +1 -1
  442. app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php +1 -1
  443. app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php +1 -1
  444. app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php +1 -1
  445. app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php +1 -1
  446. app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php +1 -1
  447. app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php +1 -1
  448. app/code/core/Mage/Adminhtml/Block/Sales/Order.php +1 -1
  449. app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php +1 -1
  450. app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php +1 -1
  451. app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php +1 -1
  452. app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php +1 -1
  453. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php +1 -1
  454. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php +1 -1
  455. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php +1 -1
  456. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php +1 -1
  457. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php +3 -5
  458. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php +2 -2
  459. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php +1 -1
  460. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php +1 -1
  461. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php +1 -1
  462. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php +1 -1
  463. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php +1 -1
  464. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php +1 -1
  465. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php +1 -1
  466. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php +1 -1
  467. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php +2 -2
  468. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php +1 -1
  469. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php +1 -1
  470. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php +2 -2
  471. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php +1 -1
  472. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php +136 -19
  473. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php +1 -1
  474. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php +1 -1
  475. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php +1 -1
  476. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php +1 -1
  477. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php +1 -1
  478. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php +1 -1
  479. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php +1 -1
  480. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php +1 -1
  481. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php +1 -1
  482. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php +1 -1
  483. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php +1 -1
  484. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php +1 -1
  485. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php +1 -1
  486. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php +1 -1
  487. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php +1 -1
  488. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php +1 -1
  489. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php +1 -1
  490. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php +1 -1
  491. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php +1 -1
  492. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php +1 -1
  493. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php +1 -1
  494. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php +1 -1
  495. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php +1 -1
  496. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php +1 -1
  497. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php +1 -1
  498. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php +1 -1
  499. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php +1 -1
  500. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php +1 -1
  501. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php +1 -1
  502. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php +1 -1
  503. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php +1 -1
  504. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php +1 -1
  505. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php +1 -1
  506. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php +1 -1
  507. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php +1 -1
  508. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php +1 -1
  509. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php +1 -1
  510. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php +1 -1
  511. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php +1 -1
  512. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php +1 -1
  513. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php +1 -1
  514. app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php +1 -1
  515. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php +1 -1
  516. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php +1 -1
  517. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php +1 -1
  518. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php +1 -1
  519. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php +1 -1
  520. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php +1 -1
  521. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php +1 -1
  522. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php +1 -1
  523. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php +1 -1
  524. app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php +1 -1
  525. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php +1 -1
  526. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php +1 -1
  527. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php +1 -1
  528. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php +1 -1
  529. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php +1 -1
  530. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php +1 -1
  531. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php +1 -1
  532. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php +1 -1
  533. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php +1 -1
  534. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php +1 -1
  535. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php +1 -1
  536. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php +1 -1
  537. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php +1 -1
  538. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php +1 -1
  539. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php +1 -1
  540. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php +1 -1
  541. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php +1 -1
  542. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php +1 -1
  543. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php +1 -1
  544. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php +1 -1
  545. app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php +1 -1
  546. app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php +1 -1
  547. app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php +1 -1
  548. app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php +12 -9
  549. app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php +1 -1
  550. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php +1 -1
  551. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php +1 -1
  552. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php +1 -1
  553. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php +1 -1
  554. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php +1 -1
  555. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php +1 -1
  556. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php +1 -1
  557. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php +1 -1
  558. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php +1 -1
  559. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php +1 -1
  560. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php +1 -1
  561. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php +1 -1
  562. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php +1 -1
  563. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php +1 -1
  564. app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php +1 -1
  565. app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php +1 -1
  566. app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php +1 -1
  567. app/code/core/Mage/Adminhtml/Block/Sales/Totals.php +1 -1
  568. app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php +1 -1
  569. app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php +1 -1
  570. app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php +1 -1
  571. app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php +1 -1
  572. app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php +1 -1
  573. app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php +1 -1
  574. app/code/core/Mage/Adminhtml/Block/Sitemap.php +1 -1
  575. app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php +1 -1
  576. app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php +1 -1
  577. app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php +1 -1
  578. app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php +1 -1
  579. app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php +4 -2
  580. app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php +1 -1
  581. app/code/core/Mage/Adminhtml/Block/Store/Switcher.php +1 -1
  582. app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php +1 -1
  583. app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php +1 -1
  584. app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php +1 -1
  585. app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php +1 -1
  586. app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php +1 -1
  587. app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php +1 -1
  588. app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php +1 -1
  589. app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php +1 -1
  590. app/code/core/Mage/Adminhtml/Block/System/Config/Form.php +1 -1
  591. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php +6 -4
  592. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php +4 -3
  593. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php +1 -1
  594. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php +1 -1
  595. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php +1 -1
  596. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php +1 -1
  597. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php +1 -1
  598. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php +1 -1
  599. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php +1 -1
  600. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php +1 -1
  601. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php +1 -1
  602. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php +5 -4
  603. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php +1 -1
  604. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php +1 -1
  605. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php +1 -1
  606. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php +1 -1
  607. app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php +1 -1
  608. app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php +1 -1
  609. app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php +1 -1
  610. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php +1 -1
  611. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php +2 -2
  612. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php +1 -1
  613. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php +1 -1
  614. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php +1 -1
  615. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php +5 -3
  616. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php +1 -1
  617. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php +1 -1
  618. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php +1 -1
  619. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php +2 -2
  620. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php +1 -1
  621. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php +1 -1
  622. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php +1 -1
  623. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php +1 -1
  624. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php +1 -1
  625. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php +1 -1
  626. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php +1 -1
  627. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php +1 -1
  628. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php +1 -1
  629. app/code/core/Mage/Adminhtml/Block/System/Currency.php +1 -1
  630. app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php +1 -1
  631. app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php +1 -1
  632. app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php +1 -1
  633. app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php +1 -1
  634. app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php +1 -1
  635. app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php +1 -1
  636. app/code/core/Mage/Adminhtml/Block/System/Design.php +1 -1
  637. app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php +1 -1
  638. app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php +1 -1
  639. app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php +1 -1
  640. app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php +1 -1
  641. app/code/core/Mage/Adminhtml/Block/System/Email/Template.php +1 -1
  642. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php +1 -1
  643. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php +1 -1
  644. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php +1 -1
  645. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php +1 -1
  646. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php +1 -1
  647. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php +1 -1
  648. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php +1 -1
  649. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php +1 -1
  650. app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php +2 -3
  651. app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php +1 -1
  652. app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php +1 -1
  653. app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php +1 -1
  654. app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php +1 -1
  655. app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php +1 -1
  656. app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php +1 -1
  657. app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php +1 -1
  658. app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php +1 -1
  659. app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php +1 -1
  660. app/code/core/Mage/Adminhtml/Block/System/Store/Store.php +1 -1
  661. app/code/core/Mage/Adminhtml/Block/System/Variable.php +1 -1
  662. app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php +2 -2
  663. app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php +1 -1
  664. app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php +1 -1
  665. app/code/core/Mage/Adminhtml/Block/Tag.php +1 -1
  666. app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php +1 -1
  667. app/code/core/Mage/Adminhtml/Block/Tag/Customer.php +2 -2
  668. app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php +1 -1
  669. app/code/core/Mage/Adminhtml/Block/Tag/Edit.php +2 -2
  670. app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php +1 -1
  671. app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php +1 -1
  672. app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php +1 -1
  673. app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php +1 -1
  674. app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php +1 -1
  675. app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php +1 -1
  676. app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php +1 -1
  677. app/code/core/Mage/Adminhtml/Block/Tag/Pending.php +1 -1
  678. app/code/core/Mage/Adminhtml/Block/Tag/Product.php +2 -2
  679. app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php +1 -1
  680. app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php +1 -1
  681. app/code/core/Mage/Adminhtml/Block/Tag/Tag.php +1 -1
  682. app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php +2 -2
  683. app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php +1 -1
  684. app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php +1 -1
  685. app/code/core/Mage/Adminhtml/Block/Tax/Class.php +1 -1
  686. app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php +2 -2
  687. app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php +1 -1
  688. app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php +1 -1
  689. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php +1 -1
  690. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php +1 -1
  691. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php +1 -1
  692. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php +1 -1
  693. app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php +1 -1
  694. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php +1 -1
  695. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php +1 -1
  696. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php +1 -1
  697. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php +1 -1
  698. app/code/core/Mage/Adminhtml/Block/Tax/Rule.php +1 -1
  699. app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php +1 -1
  700. app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php +15 -5
  701. app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php +43 -9
  702. app/code/core/Mage/Adminhtml/Block/Template.php +1 -1
  703. app/code/core/Mage/Adminhtml/Block/Text/List.php +1 -1
  704. app/code/core/Mage/Adminhtml/Block/Urlrewrite.php +1 -1
  705. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php +1 -1
  706. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php +1 -1
  707. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php +1 -1
  708. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php +1 -1
  709. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php +2 -2
  710. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php +1 -1
  711. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php +1 -1
  712. app/code/core/Mage/Adminhtml/Block/Widget.php +1 -1
  713. app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php +1 -1
  714. app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php +1 -1
  715. app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php +1 -1
  716. app/code/core/Mage/Adminhtml/Block/Widget/Button.php +1 -1
  717. app/code/core/Mage/Adminhtml/Block/Widget/Container.php +1 -1
  718. app/code/core/Mage/Adminhtml/Block/Widget/Form.php +1 -1
  719. app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php +1 -1
  720. app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php +1 -1
  721. app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php +1 -1
  722. app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php +1 -1
  723. app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php +1 -1
  724. app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php +1 -1
  725. app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php +1 -1
  726. app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +2 -2
  727. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php +1 -1
  728. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php +1 -1
  729. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php +1 -1
  730. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php +1 -1
  731. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php +1 -1
  732. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php +26 -15
  733. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php +27 -15
  734. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php +1 -1
  735. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php +1 -1
  736. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php +1 -1
  737. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php +1 -1
  738. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php +1 -1
  739. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php +1 -1
  740. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php +1 -1
  741. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php +1 -1
  742. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php +1 -1
  743. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php +1 -1
  744. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php +1 -1
  745. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php +1 -1
  746. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php +1 -1
  747. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php +1 -1
  748. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php +1 -1
  749. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php +1 -1
  750. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php +1 -1
  751. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php +1 -1
  752. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php +1 -1
  753. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php +1 -1
  754. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php +1 -1
  755. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php +1 -1
  756. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php +1 -1
  757. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php +1 -1
  758. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php +1 -1
  759. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php +1 -1
  760. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php +1 -1
  761. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php +1 -1
  762. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php +1 -1
  763. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php +1 -1
  764. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php +1 -1
  765. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php +1 -1
  766. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php +1 -1
  767. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php +1 -1
  768. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php +1 -1
  769. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php +1 -1
  770. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php +1 -1
  771. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php +1 -1
  772. app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php +1 -1
  773. app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php +1 -1
  774. app/code/core/Mage/Adminhtml/Block/Widget/Tree.php +1 -1
  775. app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php +1 -1
  776. app/code/core/Mage/Adminhtml/Controller/Action.php +1 -1
  777. app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php +1 -1
  778. app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php +1 -1
  779. app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php +1 -1
  780. app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php +1 -1
  781. app/code/core/Mage/Adminhtml/Exception.php +1 -1
  782. app/code/core/Mage/Adminhtml/Helper/Addresses.php +1 -1
  783. app/code/core/Mage/Adminhtml/Helper/Catalog.php +1 -1
  784. app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php +1 -1
  785. app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php +1 -1
  786. app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php +1 -1
  787. app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php +1 -1
  788. app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php +1 -1
  789. app/code/core/Mage/Adminhtml/Helper/Data.php +2 -2
  790. app/code/core/Mage/Adminhtml/Helper/Js.php +1 -1
  791. app/code/core/Mage/Adminhtml/Helper/Media/Js.php +1 -1
  792. app/code/core/Mage/Adminhtml/Helper/Rss.php +1 -1
  793. app/code/core/Mage/Adminhtml/Helper/Sales.php +1 -1
  794. app/code/core/Mage/Adminhtml/Model/Config.php +1 -1
  795. app/code/core/Mage/Adminhtml/Model/Config/Data.php +3 -3
  796. app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php +6 -3
  797. app/code/core/Mage/Adminhtml/Model/Email/Template.php +1 -1
  798. app/code/core/Mage/Adminhtml/Model/Extension.php +1 -1
  799. app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php +1 -1
  800. app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php +1 -1
  801. app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php +1 -1
  802. app/code/core/Mage/Adminhtml/Model/Observer.php +1 -1
  803. app/code/core/Mage/Adminhtml/Model/Report/Item.php +1 -1
  804. app/code/core/Mage/Adminhtml/Model/Sales/Order.php +3 -3
  805. app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php +18 -7
  806. app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php +1 -1
  807. app/code/core/Mage/Adminhtml/Model/Search/Catalog.php +1 -1
  808. app/code/core/Mage/Adminhtml/Model/Search/Customer.php +1 -1
  809. app/code/core/Mage/Adminhtml/Model/Search/Order.php +1 -1
  810. app/code/core/Mage/Adminhtml/Model/Session.php +1 -1
  811. app/code/core/Mage/Adminhtml/Model/Session/Quote.php +1 -1
  812. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php +1 -1
  813. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custompath.php +1 -1
  814. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Observer.php +1 -1
  815. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php +1 -1
  816. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php +1 -1
  817. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php +1 -1
  818. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php +1 -1
  819. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php +1 -1
  820. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php +1 -1
  821. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php +1 -1
  822. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php +1 -1
  823. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php +1 -1
  824. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cookie.php +1 -1
  825. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php +1 -1
  826. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php +1 -1
  827. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php +1 -1
  828. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php +1 -1
  829. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php +1 -1
  830. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Address/Street.php +1 -1
  831. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php +1 -1
  832. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Address.php +1 -1
  833. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Customer.php +1 -1
  834. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php +1 -1
  835. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php +1 -1
  836. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php +1 -1
  837. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php +1 -1
  838. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Logo.php +1 -1
  839. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php +11 -2
  840. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php +1 -1
  841. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php +1 -1
  842. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php +1 -1
  843. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php +1 -1
  844. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php +1 -1
  845. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php +1 -1
  846. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php +1 -1
  847. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php +1 -1
  848. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php +1 -1
  849. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php +1 -1
  850. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php +1 -1
  851. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php +1 -1
  852. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Secure.php +1 -1
  853. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php +1 -1
  854. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php +1 -1
  855. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php +1 -1
  856. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php +1 -1
  857. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php +1 -1
  858. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php +1 -1
  859. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php +1 -1
  860. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php +1 -1
  861. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php +1 -1
  862. app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php +1 -1
  863. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php +1 -1
  864. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php +1 -1
  865. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php +1 -1
  866. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php +1 -1
  867. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php +1 -1
  868. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php +1 -1
  869. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php +1 -1
  870. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php +1 -1
  871. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php +1 -1
  872. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Checktype.php +1 -1
  873. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php +1 -1
  874. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php +1 -1
  875. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php +1 -1
  876. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php +1 -1
  877. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php +1 -1
  878. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php +1 -1
  879. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php +1 -1
  880. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php +1 -1
  881. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php +1 -1
  882. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group/Multiselect.php +1 -1
  883. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php +1 -1
  884. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php +1 -1
  885. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php +1 -1
  886. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php +1 -1
  887. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php +1 -1
  888. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php +1 -1
  889. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php +1 -1
  890. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php +1 -1
  891. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php +1 -1
  892. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php +1 -1
  893. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php +1 -1
  894. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php +1 -1
  895. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php +1 -1
  896. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php +1 -1
  897. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php +1 -1
  898. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php +1 -1
  899. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php +38 -0
  900. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php +1 -1
  901. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php +1 -1
  902. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php +1 -1
  903. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php +1 -1
  904. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php +1 -1
  905. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php +1 -1
  906. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php +1 -1
  907. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php +1 -1
  908. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php +1 -1
  909. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php +1 -1
  910. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php +1 -1
  911. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php +1 -1
  912. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php +1 -1
  913. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php +1 -1
  914. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php +1 -1
  915. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php +1 -1
  916. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php +1 -1
  917. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php +1 -1
  918. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php +1 -1
  919. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php +1 -1
  920. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php +1 -1
  921. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php +1 -1
  922. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php +1 -1
  923. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php +1 -1
  924. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php +1 -1
  925. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php +1 -1
  926. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php +1 -1
  927. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php +1 -1
  928. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php +1 -1
  929. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php +1 -1
  930. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php +1 -1
  931. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Redirect.php +1 -1
  932. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php +1 -1
  933. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php +1 -1
  934. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php +1 -1
  935. app/code/core/Mage/Adminhtml/Model/System/Store.php +1 -1
  936. app/code/core/Mage/Adminhtml/Model/Url.php +1 -1
  937. app/code/core/Mage/Adminhtml/controllers/AjaxController.php +1 -1
  938. app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php +1 -1
  939. app/code/core/Mage/Adminhtml/controllers/Api/UserController.php +1 -1
  940. app/code/core/Mage/Adminhtml/controllers/CacheController.php +1 -1
  941. app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php +1 -1
  942. app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php +12 -12
  943. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php +5 -4
  944. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php +1 -1
  945. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php +1 -1
  946. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php +1 -1
  947. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php +1 -1
  948. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php +1 -1
  949. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php +1 -1
  950. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php +1 -1
  951. app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php +17 -5
  952. app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php +1 -1
  953. app/code/core/Mage/Adminhtml/controllers/CatalogController.php +1 -1
  954. app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php +1 -1
  955. app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php +1 -1
  956. app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php +1 -1
  957. app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php +1 -1
  958. app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php +1 -1
  959. app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php +1 -1
  960. app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php +1 -1
  961. app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php +1 -1
  962. app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php +1 -1
  963. app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php +1 -1
  964. app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php +1 -1
  965. app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php +1 -1
  966. app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php +1 -1
  967. app/code/core/Mage/Adminhtml/controllers/CustomerController.php +6 -4
  968. app/code/core/Mage/Adminhtml/controllers/DashboardController.php +1 -1
  969. app/code/core/Mage/Adminhtml/controllers/IndexController.php +1 -1
  970. app/code/core/Mage/Adminhtml/controllers/JsonController.php +1 -1
  971. app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php +1 -1
  972. app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php +1 -1
  973. app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php +1 -1
  974. app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php +1 -1
  975. app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php +1 -1
  976. app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php +1 -1
  977. app/code/core/Mage/Adminhtml/controllers/NotificationController.php +1 -1
  978. app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php +1 -1
  979. app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php +1 -1
  980. app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php +1 -1
  981. app/code/core/Mage/Adminhtml/controllers/PollController.php +1 -1
  982. app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php +2 -1
  983. app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php +1 -1
  984. app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php +1 -1
  985. app/code/core/Mage/Adminhtml/controllers/PromoController.php +1 -1
  986. app/code/core/Mage/Adminhtml/controllers/RatingController.php +1 -1
  987. app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php +1 -1
  988. app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php +1 -1
  989. app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php +1 -1
  990. app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php +1 -1
  991. app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php +1 -1
  992. app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php +1 -1
  993. app/code/core/Mage/Adminhtml/controllers/Report/TagController.php +1 -1
  994. app/code/core/Mage/Adminhtml/controllers/ReportController.php +1 -1
  995. app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php +1 -1
  996. app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php +1 -1
  997. app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php +1 -1
  998. app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php +1 -1
  999. app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php +1 -1
  1000. app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php +14 -10
  1001. app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php +1 -1
  1002. app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php +1 -1
  1003. app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php +1 -1
  1004. app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php +6 -5
  1005. app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php +1 -1
  1006. app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php +1 -1
  1007. app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php +5 -4
  1008. app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php +1 -1
  1009. app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php +1 -1
  1010. app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php +1 -1
  1011. app/code/core/Mage/Adminhtml/controllers/SalesController.php +1 -1
  1012. app/code/core/Mage/Adminhtml/controllers/SitemapController.php +1 -1
  1013. app/code/core/Mage/Adminhtml/controllers/SurveyController.php +1 -1
  1014. app/code/core/Mage/Adminhtml/controllers/System/AccountController.php +1 -1
  1015. app/code/core/Mage/Adminhtml/controllers/System/BackupController.php +1 -1
  1016. app/code/core/Mage/Adminhtml/controllers/System/CacheController.php +1 -1
  1017. app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php +1 -1
  1018. app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php +1 -1
  1019. app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php +1 -1
  1020. app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php +1 -1
  1021. app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php +1 -1
  1022. app/code/core/Mage/Adminhtml/controllers/System/DesignController.php +1 -1
  1023. app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php +73 -40
  1024. app/code/core/Mage/Adminhtml/controllers/System/StoreController.php +1 -1
  1025. app/code/core/Mage/Adminhtml/controllers/System/VariableController.php +1 -1
  1026. app/code/core/Mage/Adminhtml/controllers/SystemController.php +1 -1
  1027. app/code/core/Mage/Adminhtml/controllers/TagController.php +2 -3
  1028. app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php +1 -1
  1029. app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php +1 -1
  1030. app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php +1 -1
  1031. app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php +17 -6
  1032. app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php +83 -29
  1033. app/code/core/Mage/Adminhtml/controllers/TaxController.php +53 -0
  1034. app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php +2 -2
  1035. app/code/core/Mage/Adminhtml/etc/adminhtml.xml +1 -1
  1036. app/code/core/Mage/Adminhtml/etc/config.xml +6 -1
  1037. app/code/core/Mage/Adminhtml/etc/jstranslator.xml +1 -1
  1038. app/locale/en_US/Mage_Adminhtml.csv +9 -0
  1039. package.xml +6 -6
app/code/core/Mage/Adminhtml/Block/Abstract.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/Buttons.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/Editroles.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/Edituser.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/Role.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/Roles.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Api_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Api_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs
app/code/core/Mage/Adminhtml/Block/Api/User.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -48,7 +48,7 @@ class Mage_Adminhtml_Block_Api_User_Edit extends Mage_Adminhtml_Block_Widget_For
48
  public function getHeaderText()
49
  {
50
  if (Mage::registry('api_user')->getId()) {
51
- return Mage::helper('adminhtml')->__("Edit User '%s'", $this->htmlEscape(Mage::registry('api_user')->getUsername()));
52
  }
53
  else {
54
  return Mage::helper('adminhtml')->__('New User');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
48
  public function getHeaderText()
49
  {
50
  if (Mage::registry('api_user')->getId()) {
51
+ return Mage::helper('adminhtml')->__("Edit User '%s'", $this->escapeHtml(Mage::registry('api_user')->getUsername()));
52
  }
53
  else {
54
  return Mage::helper('adminhtml')->__('New User');
app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Api/Users.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Backup.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Backup/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cache.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cache/Additional.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cache/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -58,7 +58,7 @@ class Mage_Adminhtml_Block_Catalog_Category_Checkboxes_Tree extends Mage_Adminht
58
  protected function _getNodeJson($node, $level = 1)
59
  {
60
  $item = array();
61
- $item['text']= $this->htmlEscape($node->getName());
62
 
63
  if ($this->_withProductCount) {
64
  $item['text'].= ' ('.$node->getProductCount().')';
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
58
  protected function _getNodeJson($node, $level = 1)
59
  {
60
  $item = array();
61
+ $item['text']= $this->escapeHtml($node->getName());
62
 
63
  if ($this->_withProductCount) {
64
  $item['text'].= ' ('.$node->getProductCount().')';
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -34,6 +34,18 @@
34
  */
35
  class Mage_Adminhtml_Block_Catalog_Category_Helper_Pricestep extends Varien_Data_Form_Element_Text
36
  {
 
 
 
 
 
 
 
 
 
 
 
 
37
  /**
38
  * Retrieve Element HTML fragment
39
  *
@@ -41,26 +53,30 @@ class Mage_Adminhtml_Block_Catalog_Category_Helper_Pricestep extends Varien_Data
41
  */
42
  public function getElementHtml()
43
  {
 
44
  $disabled = false;
45
- if (!$this->getValue()) {
 
46
  $this->setData('disabled', 'disabled');
47
  $disabled = true;
48
  }
 
49
  parent::addClass('validate-number validate-number-range number-range-0.01-1000000000');
50
  $html = parent::getElementHtml();
51
  $htmlId = 'use_config_' . $this->getHtmlId();
52
  $html .= '<br/><input id="'.$htmlId.'" name="use_config[]" value="' . $this->getId() . '"';
53
  $html .= ($disabled ? ' checked="checked"' : '');
54
- if ($this->getReadonly()) {
 
55
  $html .= ' disabled="disabled"';
56
  }
 
57
  $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
58
 
59
- $html .= ' <label for="'.$htmlId.'" class="normal">'
60
- . Mage::helper('adminhtml')->__('Use Config Settings').'</label>';
61
- $html .= '<script type="text/javascript">'
62
- . 'toggleValueElements($(\''.$htmlId.'\'), $(\''.$htmlId.'\').parentNode);'
63
- . '</script>';
64
 
65
  return $html;
66
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
34
  */
35
  class Mage_Adminhtml_Block_Catalog_Category_Helper_Pricestep extends Varien_Data_Form_Element_Text
36
  {
37
+ /**
38
+ * Returns js code that is used instead of default toggle code for "Use default config" checkbox
39
+ *
40
+ * @return string
41
+ */
42
+ public function getToggleCode()
43
+ {
44
+ $htmlId = 'use_config_' . $this->getHtmlId();
45
+ return "toggleValueElements(this, this.parentNode.parentNode);"
46
+ . "if (!this.checked) toggleValueElements($('$htmlId'), $('$htmlId').parentNode);";
47
+ }
48
+
49
  /**
50
  * Retrieve Element HTML fragment
51
  *
53
  */
54
  public function getElementHtml()
55
  {
56
+ $elementDisabled = $this->getDisabled() == 'disabled';
57
  $disabled = false;
58
+
59
+ if (!$this->getValue() || $elementDisabled) {
60
  $this->setData('disabled', 'disabled');
61
  $disabled = true;
62
  }
63
+
64
  parent::addClass('validate-number validate-number-range number-range-0.01-1000000000');
65
  $html = parent::getElementHtml();
66
  $htmlId = 'use_config_' . $this->getHtmlId();
67
  $html .= '<br/><input id="'.$htmlId.'" name="use_config[]" value="' . $this->getId() . '"';
68
  $html .= ($disabled ? ' checked="checked"' : '');
69
+
70
+ if ($this->getReadonly() || $elementDisabled) {
71
  $html .= ' disabled="disabled"';
72
  }
73
+
74
  $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
75
 
76
+ $html .= ' <label for="' . $htmlId . '" class="normal">'
77
+ . Mage::helper('adminhtml')->__('Use Config Settings') .'</label>';
78
+ $html .= '<script type="text/javascript">' . 'toggleValueElements($(\'' . $htmlId . '\'), $(\'' . $htmlId
79
+ . '\').parentNode);' . '</script>';
 
80
 
81
  return $html;
82
  }
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -35,32 +35,47 @@
35
  class Mage_Adminhtml_Block_Catalog_Category_Helper_Sortby_Available
36
  extends Varien_Data_Form_Element_Multiselect
37
  {
38
- /**
 
 
 
 
 
 
 
 
 
 
 
 
39
  * Retrieve Element HTML fragment
40
  *
41
  * @return string
42
  */
43
  public function getElementHtml()
44
  {
 
45
  $disabled = false;
46
- if (!$this->getValue()) {
 
47
  $this->setData('disabled', 'disabled');
48
  $disabled = true;
49
  }
 
50
  $html = parent::getElementHtml();
51
  $htmlId = 'use_config_' . $this->getHtmlId();
52
- $html .= '<input id="'.$htmlId.'" name="use_config[]" value="' . $this->getId() . '"';
53
  $html .= ($disabled ? ' checked="checked"' : '');
54
 
55
- if ($this->getReadonly()) {
56
  $html .= ' disabled="disabled"';
57
  }
58
 
59
  $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
60
-
61
- $html .= ' <label for="'.$htmlId.'" class="normal">'
62
- . Mage::helper('adminhtml')->__('Use All Available Attributes').'</label>';
63
- $html .= '<script type="text/javascript">toggleValueElements($(\''.$htmlId.'\'), $(\''.$htmlId.'\').parentNode);</script>';
64
 
65
  return $html;
66
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
35
  class Mage_Adminhtml_Block_Catalog_Category_Helper_Sortby_Available
36
  extends Varien_Data_Form_Element_Multiselect
37
  {
38
+ /**
39
+ * Returns js code that is used instead of default toggle code for "Use default config" checkbox
40
+ *
41
+ * @return string
42
+ */
43
+ public function getToggleCode()
44
+ {
45
+ $htmlId = 'use_config_' . $this->getHtmlId();
46
+ return "toggleValueElements(this, this.parentNode.parentNode);"
47
+ . "if (!this.checked) toggleValueElements($('$htmlId'), $('$htmlId').parentNode);";
48
+ }
49
+
50
+ /**
51
  * Retrieve Element HTML fragment
52
  *
53
  * @return string
54
  */
55
  public function getElementHtml()
56
  {
57
+ $elementDisabled = $this->getDisabled() == 'disabled';
58
  $disabled = false;
59
+
60
+ if (!$this->getValue() || $elementDisabled) {
61
  $this->setData('disabled', 'disabled');
62
  $disabled = true;
63
  }
64
+
65
  $html = parent::getElementHtml();
66
  $htmlId = 'use_config_' . $this->getHtmlId();
67
+ $html .= '<input id="' . $htmlId . '" name="use_config[]" value="' . $this->getId() . '"';
68
  $html .= ($disabled ? ' checked="checked"' : '');
69
 
70
+ if ($this->getReadonly() || $elementDisabled) {
71
  $html .= ' disabled="disabled"';
72
  }
73
 
74
  $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
75
+ $html .= ' <label for="' . $htmlId . '" class="normal">'
76
+ . Mage::helper('adminhtml')->__('Use All Available Attributes') . '</label>';
77
+ $html .= '<script type="text/javascript">toggleValueElements($(\'' . $htmlId . '\'), $(\'' . $htmlId
78
+ .'\').parentNode);</script>';
79
 
80
  return $html;
81
  }
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -35,6 +35,18 @@
35
  class Mage_Adminhtml_Block_Catalog_Category_Helper_Sortby_Default
36
  extends Varien_Data_Form_Element_Select
37
  {
 
 
 
 
 
 
 
 
 
 
 
 
38
  /**
39
  * Retrieve Element HTML fragment
40
  *
@@ -42,25 +54,28 @@ class Mage_Adminhtml_Block_Catalog_Category_Helper_Sortby_Default
42
  */
43
  public function getElementHtml()
44
  {
 
45
  $disabled = false;
46
- if (!$this->getValue()) {
 
47
  $this->setData('disabled', 'disabled');
48
  $disabled = true;
49
  }
 
50
  $html = parent::getElementHtml();
51
  $htmlId = 'use_config_' . $this->getHtmlId();
52
- $html .= '<input id="'.$htmlId.'" name="use_config[]" value="' . $this->getId() . '"';
53
  $html .= ($disabled ? ' checked="checked"' : '');
54
- if ($this->getReadonly()) {
 
55
  $html .= ' disabled="disabled"';
56
  }
57
- $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
58
 
59
-
60
-
61
- $html .= ' <label for="'.$htmlId.'" class="normal">'
62
- . Mage::helper('adminhtml')->__('Use Config Settings').'</label>';
63
- $html .= '<script type="text/javascript">toggleValueElements($(\''.$htmlId.'\'), $(\''.$htmlId.'\').parentNode);</script>';
64
 
65
  return $html;
66
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
35
  class Mage_Adminhtml_Block_Catalog_Category_Helper_Sortby_Default
36
  extends Varien_Data_Form_Element_Select
37
  {
38
+ /**
39
+ * Returns js code that is used instead of default toggle code for "Use default config" checkbox
40
+ *
41
+ * @return string
42
+ */
43
+ public function getToggleCode()
44
+ {
45
+ $htmlId = 'use_config_' . $this->getHtmlId();
46
+ return "toggleValueElements(this, this.parentNode.parentNode);"
47
+ . "if (!this.checked) toggleValueElements($('$htmlId'), $('$htmlId').parentNode);";
48
+ }
49
+
50
  /**
51
  * Retrieve Element HTML fragment
52
  *
54
  */
55
  public function getElementHtml()
56
  {
57
+ $elementDisabled = $this->getDisabled() == 'disabled';
58
  $disabled = false;
59
+
60
+ if (!$this->getValue() || $elementDisabled) {
61
  $this->setData('disabled', 'disabled');
62
  $disabled = true;
63
  }
64
+
65
  $html = parent::getElementHtml();
66
  $htmlId = 'use_config_' . $this->getHtmlId();
67
+ $html .= '<input id="' . $htmlId . '" name="use_config[]" value="' . $this->getId() . '"';
68
  $html .= ($disabled ? ' checked="checked"' : '');
69
+
70
+ if ($this->getReadonly() || $elementDisabled) {
71
  $html .= ' disabled="disabled"';
72
  }
 
73
 
74
+ $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
75
+ $html .= ' <label for="' . $htmlId . '" class="normal">'
76
+ . Mage::helper('adminhtml')->__('Use Config Settings') . '</label>';
77
+ $html .= '<script type="text/javascript">toggleValueElements($(\'' . $htmlId . '\'), $(\'' . $htmlId
78
+ . '\').parentNode);</script>';
79
 
80
  return $html;
81
  }
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -111,16 +111,15 @@ class Mage_Adminhtml_Block_Catalog_Category_Tab_Attributes extends Mage_Adminhtm
111
  }
112
 
113
  $this->_setFieldset($attributes, $fieldset);
114
-
115
  foreach ($attributes as $attribute) {
 
116
  /* @var $attribute Mage_Eav_Model_Entity_Attribute */
117
  if ($attribute->getAttributeCode() == 'url_key') {
118
- if ($this->getCategory()->getLevel() == 1) {
 
 
 
119
  $fieldset->removeField('url_key');
120
- $fieldset->addField('url_key', 'hidden', array(
121
- 'name' => 'url_key',
122
- 'value' => $this->getCategory()->getUrlKey()
123
- ));
124
  } else {
125
  $form->getElement('url_key')->setRenderer(
126
  $this->getLayout()->createBlock('adminhtml/catalog_form_renderer_attribute_urlkey')
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
111
  }
112
 
113
  $this->_setFieldset($attributes, $fieldset);
 
114
  foreach ($attributes as $attribute) {
115
+ $rootId = Mage_Catalog_Model_Category::TREE_ROOT_ID;
116
  /* @var $attribute Mage_Eav_Model_Entity_Attribute */
117
  if ($attribute->getAttributeCode() == 'url_key') {
118
+ if (
119
+ (!$this->getCategory()->getId() && $this->getRequest()->getParam('parent', $rootId) == $rootId)
120
+ || ($this->getCategory()->getParentId() == $rootId)
121
+ ) {
122
  $fieldset->removeField('url_key');
 
 
 
 
123
  } else {
124
  $form->getElement('url_key')->setRenderer(
125
  $this->getLayout()->createBlock('adminhtml/catalog_form_renderer_attribute_urlkey')
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Catalog_Category_Tab_Design extends Mage_Adminhtml_Block_Catalog_Form
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Catalog_Category_Tab_Design extends Mage_Adminhtml_Block_Catalog_Form
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -123,7 +123,7 @@ class Mage_Adminhtml_Block_Catalog_Category_Tab_General extends Mage_Adminhtml_B
123
  if ($node) {
124
  $options[] = array(
125
  'value' => $node->getPathId(),
126
- 'label' => str_repeat('&nbsp;', max(0, 3*($node->getLevel()))) . $this->htmlEscape($node->getName()),
127
  );
128
 
129
  foreach ($node->getChildren() as $child) {
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
123
  if ($node) {
124
  $options[] = array(
125
  'value' => $node->getPathId(),
126
+ 'label' => str_repeat('&nbsp;', max(0, 3*($node->getLevel()))) . $this->escapeHtml($node->getName()),
127
  );
128
 
129
  foreach ($node->getChildren() as $child) {
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -151,7 +151,10 @@ class Mage_Adminhtml_Block_Catalog_Category_Tree extends Mage_Adminhtml_Block_Ca
151
 
152
  public function getSwitchTreeUrl()
153
  {
154
- return $this->getUrl("*/catalog_category/tree", array('_current'=>true, 'store'=>null, '_query'=>false, 'id'=>null, 'parent'=>null));
 
 
 
155
  }
156
 
157
  public function getIsWasExpanded()
@@ -202,7 +205,9 @@ class Mage_Adminhtml_Block_Catalog_Category_Tree extends Mage_Adminhtml_Block_Ca
202
  return
203
  '<script type="text/javascript">'
204
  . $javascriptVarName . ' = ' . Mage::helper('core')->jsonEncode($categories) . ';'
205
- . ($this->canAddSubCategory() ? '$("add_subcategory_button").show();' : '$("add_subcategory_button").hide();')
 
 
206
  . '</script>';
207
  }
208
 
@@ -223,7 +228,9 @@ class Mage_Adminhtml_Block_Catalog_Category_Tree extends Mage_Adminhtml_Block_Ca
223
  $item = array();
224
  $item['text'] = $this->buildNodeName($node);
225
 
226
- //$rootForStores = Mage::getModel('core/store')->getCollection()->loadByCategoryIds(array($node->getEntityId()));
 
 
227
  $rootForStores = in_array($node->getEntityId(), $this->getRootIds());
228
 
229
  $item['id'] = $node->getId();
@@ -267,7 +274,7 @@ class Mage_Adminhtml_Block_Catalog_Category_Tree extends Mage_Adminhtml_Block_Ca
267
  */
268
  public function buildNodeName($node)
269
  {
270
- $result = $this->htmlEscape($node->getName());
271
  if ($this->_withProductCount) {
272
  $result .= ' (' . $node->getProductCount() . ')';
273
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
151
 
152
  public function getSwitchTreeUrl()
153
  {
154
+ return $this->getUrl(
155
+ "*/catalog_category/tree",
156
+ array('_current'=>true, 'store'=>null, '_query'=>false, 'id'=>null, 'parent'=>null)
157
+ );
158
  }
159
 
160
  public function getIsWasExpanded()
205
  return
206
  '<script type="text/javascript">'
207
  . $javascriptVarName . ' = ' . Mage::helper('core')->jsonEncode($categories) . ';'
208
+ . ($this->canAddSubCategory()
209
+ ? '$("add_subcategory_button").show();'
210
+ : '$("add_subcategory_button").hide();')
211
  . '</script>';
212
  }
213
 
228
  $item = array();
229
  $item['text'] = $this->buildNodeName($node);
230
 
231
+ /* $rootForStores = Mage::getModel('core/store')
232
+ ->getCollection()
233
+ ->loadByCategoryIds(array($node->getEntityId())); */
234
  $rootForStores = in_array($node->getEntityId(), $this->getRootIds());
235
 
236
  $item['id'] = $node->getId();
274
  */
275
  public function buildNodeName($node)
276
  {
277
+ $result = $this->escapeHtml($node->getName());
278
  if ($this->_withProductCount) {
279
  $result .= ' (' . $node->getProductCount() . ')';
280
  }
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -140,7 +140,20 @@ class Mage_Adminhtml_Block_Catalog_Form_Renderer_Fieldset_Element
140
  if (!$attribute || Mage::app()->isSingleStoreMode() || $attribute->getFrontendInput()=='gallery') {
141
  return $html;
142
  }
143
- if ($attribute->isScopeGlobal()) {
 
 
 
 
 
 
 
 
 
 
 
 
 
144
  $html .= Mage::helper('adminhtml')->__('[GLOBAL]');
145
  } elseif ($attribute->isScopeWebsite()) {
146
  $html .= Mage::helper('adminhtml')->__('[WEBSITE]');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
140
  if (!$attribute || Mage::app()->isSingleStoreMode() || $attribute->getFrontendInput()=='gallery') {
141
  return $html;
142
  }
143
+
144
+ /*
145
+ * Check if the current attribute is a 'price' attribute. If yes, check
146
+ * the config setting 'Catalog Price Scope' and modify the scope label.
147
+ */
148
+ $isGlobalPriceScope = false;
149
+ if ($attribute->getFrontendInput() == 'price') {
150
+ $priceScope = Mage::getStoreConfig('catalog/price/scope');
151
+ if ($priceScope == 0) {
152
+ $isGlobalPriceScope = true;
153
+ }
154
+ }
155
+
156
+ if ($attribute->isScopeGlobal() || $isGlobalPriceScope) {
157
  $html .= Mage::helper('adminhtml')->__('[GLOBAL]');
158
  } elseif ($attribute->isScopeWebsite()) {
159
  $html .= Mage::helper('adminhtml')->__('[WEBSITE]');
app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -48,7 +48,7 @@ class Mage_Adminhtml_Block_Catalog_Helper_Form_Wysiwyg extends Varien_Data_Form_
48
  'label' => Mage::helper('catalog')->__('WYSIWYG Editor'),
49
  'type' => 'button',
50
  'disabled' => $disabled,
51
- 'class' => ($disabled) ? 'disabled btn-wysiwyg' : 'btn-wysiwyg',
52
  'onclick' => 'catalogWysiwygEditor.open(\''.Mage::helper('adminhtml')->getUrl('*/*/wysiwyg').'\', \''.$this->getHtmlId().'\')'
53
  ))->toHtml();
54
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
48
  'label' => Mage::helper('catalog')->__('WYSIWYG Editor'),
49
  'type' => 'button',
50
  'disabled' => $disabled,
51
+ 'class' => 'btn-wysiwyg',
52
  'onclick' => 'catalogWysiwygEditor.open(\''.Mage::helper('adminhtml')->getUrl('*/*/wysiwyg').'\', \''.$this->getHtmlId().'\')'
53
  ))->toHtml();
54
  }
app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -82,7 +82,7 @@ class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit extends Mage_Adminhtml
82
  if (is_array($frontendLabel)) {
83
  $frontendLabel = $frontendLabel[0];
84
  }
85
- return Mage::helper('catalog')->__('Edit Product Attribute "%s"', $this->htmlEscape($frontendLabel));
86
  }
87
  else {
88
  return Mage::helper('catalog')->__('New Product Attribute');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
82
  if (is_array($frontendLabel)) {
83
  $frontendLabel = $frontendLabel[0];
84
  }
85
+ return Mage::helper('catalog')->__('Edit Product Attribute "%s"', $this->escapeHtml($frontendLabel));
86
  }
87
  else {
88
  return Mage::helper('catalog')->__('New Product Attribute');
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -57,7 +57,8 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit extends Mage_Adminhtml_Block_Wid
57
  $this->getLayout()->createBlock('adminhtml/widget_button')
58
  ->setData(array(
59
  'label' => Mage::helper('catalog')->__('Back'),
60
- 'onclick' => 'setLocation(\''.$this->getUrl('*/*/', array('store'=>$this->getRequest()->getParam('store', 0))).'\')',
 
61
  'class' => 'back'
62
  ))
63
  );
@@ -107,7 +108,8 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit extends Mage_Adminhtml_Block_Wid
107
  $this->getLayout()->createBlock('adminhtml/widget_button')
108
  ->setData(array(
109
  'label' => Mage::helper('catalog')->__('Delete'),
110
- 'onclick' => 'confirmSetLocation(\''.Mage::helper('catalog')->__('Are you sure?').'\', \''.$this->getDeleteUrl().'\')',
 
111
  'class' => 'delete'
112
  ))
113
  );
@@ -211,7 +213,7 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit extends Mage_Adminhtml_Block_Wid
211
  {
212
  $header = '';
213
  if ($this->getProduct()->getId()) {
214
- $header = $this->htmlEscape($this->getProduct()->getName());
215
  }
216
  else {
217
  $header = Mage::helper('catalog')->__('New Product');
@@ -235,7 +237,10 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit extends Mage_Adminhtml_Block_Wid
235
  public function getIsConfigured()
236
  {
237
  if ($this->getProduct()->isConfigurable()
238
- && !($superAttributes = $this->getProduct()->getTypeInstance(true)->getUsedProductAttributeIds($this->getProduct()))) {
 
 
 
239
  $superAttributes = false;
240
  }
241
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
57
  $this->getLayout()->createBlock('adminhtml/widget_button')
58
  ->setData(array(
59
  'label' => Mage::helper('catalog')->__('Back'),
60
+ 'onclick' => 'setLocation(\''
61
+ . $this->getUrl('*/*/', array('store'=>$this->getRequest()->getParam('store', 0))).'\')',
62
  'class' => 'back'
63
  ))
64
  );
108
  $this->getLayout()->createBlock('adminhtml/widget_button')
109
  ->setData(array(
110
  'label' => Mage::helper('catalog')->__('Delete'),
111
+ 'onclick' => 'confirmSetLocation(\''
112
+ . Mage::helper('catalog')->__('Are you sure?').'\', \''.$this->getDeleteUrl().'\')',
113
  'class' => 'delete'
114
  ))
115
  );
213
  {
214
  $header = '';
215
  if ($this->getProduct()->getId()) {
216
+ $header = $this->escapeHtml($this->getProduct()->getName());
217
  }
218
  else {
219
  $header = Mage::helper('catalog')->__('New Product');
237
  public function getIsConfigured()
238
  {
239
  if ($this->getProduct()->isConfigurable()
240
+ && !($superAttributes = $this->getProduct()
241
+ ->getTypeInstance(true)
242
+ ->getUsedProductAttributeIds($this->getProduct()))
243
+ ) {
244
  $superAttributes = false;
245
  }
246
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -232,7 +232,7 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option extends Mage_
232
  $value['id'] = $option->getOptionId();
233
  $value['item_count'] = $this->getItemCount();
234
  $value['option_id'] = $option->getOptionId();
235
- $value['title'] = $this->htmlEscape($option->getTitle());
236
  $value['type'] = $option->getType();
237
  $value['is_require'] = $option->getIsRequire();
238
  $value['sort_order'] = $option->getSortOrder();
@@ -256,11 +256,11 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option extends Mage_
256
  'item_count' => max($itemCount, $_value->getOptionTypeId()),
257
  'option_id' => $_value->getOptionId(),
258
  'option_type_id' => $_value->getOptionTypeId(),
259
- 'title' => $this->htmlEscape($_value->getTitle()),
260
  'price' => ($showPrice)
261
  ? $this->getPriceValue($_value->getPrice(), $_value->getPriceType()) : '',
262
  'price_type' => ($showPrice) ? $_value->getPriceType() : 0,
263
- 'sku' => $this->htmlEscape($_value->getSku()),
264
  'sort_order' => $_value->getSortOrder(),
265
  );
266
 
@@ -284,7 +284,7 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option extends Mage_
284
  $value['price'] = ($showPrice)
285
  ? $this->getPriceValue($option->getPrice(), $option->getPriceType()) : '';
286
  $value['price_type'] = $option->getPriceType();
287
- $value['sku'] = $this->htmlEscape($option->getSku());
288
  $value['max_characters'] = $option->getMaxCharacters();
289
  $value['file_extension'] = $option->getFileExtension();
290
  $value['image_size_x'] = $option->getImageSizeX();
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
232
  $value['id'] = $option->getOptionId();
233
  $value['item_count'] = $this->getItemCount();
234
  $value['option_id'] = $option->getOptionId();
235
+ $value['title'] = $this->escapeHtml($option->getTitle());
236
  $value['type'] = $option->getType();
237
  $value['is_require'] = $option->getIsRequire();
238
  $value['sort_order'] = $option->getSortOrder();
256
  'item_count' => max($itemCount, $_value->getOptionTypeId()),
257
  'option_id' => $_value->getOptionId(),
258
  'option_type_id' => $_value->getOptionTypeId(),
259
+ 'title' => $this->escapeHtml($_value->getTitle()),
260
  'price' => ($showPrice)
261
  ? $this->getPriceValue($_value->getPrice(), $_value->getPriceType()) : '',
262
  'price_type' => ($showPrice) ? $_value->getPriceType() : 0,
263
+ 'sku' => $this->escapeHtml($_value->getSku()),
264
  'sort_order' => $_value->getSortOrder(),
265
  );
266
 
284
  $value['price'] = ($showPrice)
285
  ? $this->getPriceValue($option->getPrice(), $option->getPriceType()) : '';
286
  $value['price_type'] = $option->getPriceType();
287
+ $value['sku'] = $this->escapeHtml($option->getSku());
288
  $value['max_characters'] = $option->getMaxCharacters();
289
  $value['file_extension'] = $option->getFileExtension();
290
  $value['image_size_x'] = $option->getImageSizeX();
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -33,7 +33,16 @@
33
  */
34
  class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid extends Mage_Adminhtml_Block_Widget_Grid
35
  {
 
 
 
 
 
 
36
 
 
 
 
37
  public function __construct()
38
  {
39
  parent::__construct();
@@ -41,7 +50,7 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid extends Ma
41
  $this->setId('super_product_links');
42
 
43
  if ($this->_getProduct()->getId()) {
44
- $this->setDefaultFilter(array('in_products'=>1));
45
  }
46
  }
47
 
@@ -309,4 +318,87 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid extends Ma
309
  return $this->getUrl('*/*/superConfig', array('_current'=>true));
310
  }
311
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
312
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
33
  */
34
  class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid extends Mage_Adminhtml_Block_Widget_Grid
35
  {
36
+ /**
37
+ * Config attribute codes
38
+ *
39
+ * @var null|array
40
+ */
41
+ protected $_configAttributeCodes = null;
42
 
43
+ /**
44
+ * Constructor
45
+ */
46
  public function __construct()
47
  {
48
  parent::__construct();
50
  $this->setId('super_product_links');
51
 
52
  if ($this->_getProduct()->getId()) {
53
+ $this->setDefaultFilter(array('in_products' => 1));
54
  }
55
  }
56
 
318
  return $this->getUrl('*/*/superConfig', array('_current'=>true));
319
  }
320
 
321
+ /**
322
+ * Retrieving configurable attributes
323
+ *
324
+ * @return array
325
+ */
326
+ protected function _getConfigAttributeCodes()
327
+ {
328
+ if (is_null($this->_configAttributeCodes)) {
329
+ $product = $this->_getProduct();
330
+ $attributes = $product->getTypeInstance(true)->getConfigurableAttributes($product);
331
+ $attributeCodes = array();
332
+ foreach ($attributes as $attribute) {
333
+ $productAttribute = $attribute->getProductAttribute();
334
+ $attributeCodes[] = $productAttribute->getAttributeCode();
335
+ }
336
+ $this->_configAttributeCodes = $attributeCodes;
337
+ }
338
+ return $this->_configAttributeCodes;
339
+ }
340
+
341
+ /**
342
+ * Retrieve item row configurable attribute data
343
+ *
344
+ * @param Varien_Object $item
345
+ * @return array
346
+ */
347
+ protected function _retrieveRowData(Varien_Object $item)
348
+ {
349
+ $attributeValues = array();
350
+ foreach ($this->_getConfigAttributeCodes() as $attributeCode) {
351
+ $data = $item->getData($attributeCode);
352
+ if ($data) {
353
+ $attributeValues[$attributeCode] = $data;
354
+ }
355
+ }
356
+ return $attributeValues;
357
+ }
358
+
359
+ /**
360
+ * Checking the data contains the same value of data after collection
361
+ *
362
+ * @return Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid
363
+ */
364
+ protected function _afterLoadCollection()
365
+ {
366
+ parent::_afterLoadCollection();
367
+
368
+ $attributeCodes = $this->_getConfigAttributeCodes();
369
+ if (!$attributeCodes) {
370
+ return $this;
371
+ }
372
+
373
+ $disableMultiSelect = false;
374
+ $ids = array();
375
+ foreach ($this->_collection as $item) {
376
+ $ids[] = $item->getId();
377
+ $needleAttributeValues = $this->_retrieveRowData($item);
378
+ foreach($this->_collection as $item2) {
379
+ // Skip the data if already checked
380
+ if (in_array($item2->getId(), $ids)) {
381
+ continue;
382
+ }
383
+ $attributeValues = $this->_retrieveRowData($item2);
384
+ $disableMultiSelect = ($needleAttributeValues == $attributeValues);
385
+ if ($disableMultiSelect) {
386
+ break;
387
+ }
388
+ }
389
+ if ($disableMultiSelect) {
390
+ break;
391
+ }
392
+ }
393
+
394
+ // Disable multiselect column
395
+ if ($disableMultiSelect) {
396
+ $selectAll = $this->getColumn('in_products');
397
+ if ($selectAll) {
398
+ $selectAll->setDisabled(true);
399
+ }
400
+ }
401
+
402
+ return $this;
403
+ }
404
  }
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Price.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Search.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -49,7 +49,7 @@ class Mage_Adminhtml_Block_Catalog_Search_Edit extends Mage_Adminhtml_Block_Widg
49
  public function getHeaderText()
50
  {
51
  if (Mage::registry('current_catalog_search')->getId()) {
52
- return Mage::helper('catalog')->__("Edit Search '%s'", $this->htmlEscape(Mage::registry('current_catalog_search')->getQueryText()));
53
  }
54
  else {
55
  return Mage::helper('catalog')->__('New Search');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
49
  public function getHeaderText()
50
  {
51
  if (Mage::registry('current_catalog_search')->getId()) {
52
+ return Mage::helper('catalog')->__("Edit Search '%s'", $this->escapeHtml(Mage::registry('current_catalog_search')->getQueryText()));
53
  }
54
  else {
55
  return Mage::helper('catalog')->__('New Search');
app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Checkout_Agreement_Grid extends Mage_Adminhtml_Block_Widget_Grid
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Checkout_Agreement_Grid extends Mage_Adminhtml_Block_Widget_Grid
app/code/core/Mage/Adminhtml/Block/Cms/Block.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -73,7 +73,7 @@ class Mage_Adminhtml_Block_Cms_Block_Edit extends Mage_Adminhtml_Block_Widget_Fo
73
  public function getHeaderText()
74
  {
75
  if (Mage::registry('cms_block')->getId()) {
76
- return Mage::helper('cms')->__("Edit Block '%s'", $this->htmlEscape(Mage::registry('cms_block')->getTitle()));
77
  }
78
  else {
79
  return Mage::helper('cms')->__('New Block');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
73
  public function getHeaderText()
74
  {
75
  if (Mage::registry('cms_block')->getId()) {
76
+ return Mage::helper('cms')->__("Edit Block '%s'", $this->escapeHtml(Mage::registry('cms_block')->getTitle()));
77
  }
78
  else {
79
  return Mage::helper('cms')->__('New Block');
app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Page.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -71,7 +71,7 @@ class Mage_Adminhtml_Block_Cms_Page_Edit extends Mage_Adminhtml_Block_Widget_For
71
  public function getHeaderText()
72
  {
73
  if (Mage::registry('cms_page')->getId()) {
74
- return Mage::helper('cms')->__("Edit Page '%s'", $this->htmlEscape(Mage::registry('cms_page')->getTitle()));
75
  }
76
  else {
77
  return Mage::helper('cms')->__('New Page');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
71
  public function getHeaderText()
72
  {
73
  if (Mage::registry('cms_page')->getId()) {
74
+ return Mage::helper('cms')->__("Edit Page '%s'", $this->escapeHtml(Mage::registry('cms_page')->getTitle()));
75
  }
76
  else {
77
  return Mage::helper('cms')->__('New Page');
app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Cms_Page_Edit_Tab_Design
@@ -89,7 +89,8 @@ class Mage_Adminhtml_Block_Cms_Page_Edit_Tab_Design
89
  'label' => Mage::helper('cms')->__('Custom Design From'),
90
  'image' => $this->getSkinUrl('images/grid-cal.gif'),
91
  'format' => $dateFormatIso,
92
- 'disabled' => $isElementDisabled
 
93
  ));
94
 
95
  $designFieldset->addField('custom_theme_to', 'date', array(
@@ -97,7 +98,8 @@ class Mage_Adminhtml_Block_Cms_Page_Edit_Tab_Design
97
  'label' => Mage::helper('cms')->__('Custom Design To'),
98
  'image' => $this->getSkinUrl('images/grid-cal.gif'),
99
  'format' => $dateFormatIso,
100
- 'disabled' => $isElementDisabled
 
101
  ));
102
 
103
  $designFieldset->addField('custom_theme', 'select', array(
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Cms_Page_Edit_Tab_Design
89
  'label' => Mage::helper('cms')->__('Custom Design From'),
90
  'image' => $this->getSkinUrl('images/grid-cal.gif'),
91
  'format' => $dateFormatIso,
92
+ 'disabled' => $isElementDisabled,
93
+ 'class' => 'validate-date validate-date-range date-range-custom_theme-from'
94
  ));
95
 
96
  $designFieldset->addField('custom_theme_to', 'date', array(
98
  'label' => Mage::helper('cms')->__('Custom Design To'),
99
  'image' => $this->getSkinUrl('images/grid-cal.gif'),
100
  'format' => $dateFormatIso,
101
+ 'disabled' => $isElementDisabled,
102
+ 'class' => 'validate-date validate-date-range date-range-custom_theme-to'
103
  ));
104
 
105
  $designFieldset->addField('custom_theme', 'select', array(
app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -75,7 +75,7 @@ class Mage_Adminhtml_Block_Customer_Edit extends Mage_Adminhtml_Block_Widget_For
75
  public function getHeaderText()
76
  {
77
  if (Mage::registry('current_customer')->getId()) {
78
- return $this->htmlEscape(Mage::registry('current_customer')->getName());
79
  }
80
  else {
81
  return Mage::helper('customer')->__('New Customer');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
75
  public function getHeaderText()
76
  {
77
  if (Mage::registry('current_customer')->getId()) {
78
+ return $this->escapeHtml(Mage::registry('current_customer')->getName());
79
  }
80
  else {
81
  return Mage::helper('customer')->__('New Customer');
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -29,28 +29,40 @@
29
  *
30
  * @category Mage
31
  * @package Mage_Adminhtml
32
- * @author Magento Core Team <core@magentocommerce.com>
33
  */
34
- class Mage_Adminhtml_Block_Customer_Edit_Renderer_Newpass extends Mage_Adminhtml_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface
 
 
35
  {
36
-
 
 
 
 
 
37
  public function render(Varien_Data_Form_Element_Abstract $element)
38
  {
39
- $html = '<tr>';
40
- $html.= '<td class="label">'.$element->getLabelHtml().'</td>';
41
- $html.= '<td class="value">'.$element->getElementHtml().'</td>';
42
- $html.= '</tr>'."\n";
43
- $html.= '<tr>';
44
- $html.= '<td class="label"><label>&nbsp;</label></td>';
45
- $html.= '<td class="value">'.Mage::helper('customer')->__('or').'</td>';
46
- $html.= '</tr>'."\n";
47
- $html.= '<tr>';
48
- $html.= '<td class="label"><label>&nbsp;</label></td>';
49
- $html.= '<td class="value"><input type="checkbox" id="account-send-pass" name="'.$element->getName().'" value="auto" onclick="setElementDisable(\''.$element->getHtmlId().'\', this.checked)"/>&nbsp;';
50
- $html.= '<label for="account-send-pass">'.Mage::helper('customer')->__('Send auto-generated password').'</label></td>';
51
- $html.= '</tr>'."\n";
 
 
 
 
 
 
52
 
53
  return $html;
54
  }
55
-
56
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
29
  *
30
  * @category Mage
31
  * @package Mage_Adminhtml
32
+ * @author Magento Core Team <core@magentocommerce.com>
33
  */
34
+ class Mage_Adminhtml_Block_Customer_Edit_Renderer_Newpass
35
+ extends Mage_Adminhtml_Block_Abstract
36
+ implements Varien_Data_Form_Element_Renderer_Interface
37
  {
38
+ /**
39
+ * Render block
40
+ *
41
+ * @param Varien_Data_Form_Element_Abstract $element
42
+ * @return string
43
+ */
44
  public function render(Varien_Data_Form_Element_Abstract $element)
45
  {
46
+ $html = '<tr>';
47
+ $html .= '<td class="label">' . $element->getLabelHtml() . '</td>';
48
+ $html .= '<td class="value">' . $element->getElementHtml() . '</td>';
49
+ $html .= '</tr>' . "\n";
50
+ $html .= '<tr>';
51
+ $html .= '<td class="label"><label>&nbsp;</label></td>';
52
+ $html .= '<td class="value">' . Mage::helper('customer')->__('or') . '</td>';
53
+ $html .= '</tr>' . "\n";
54
+ $html .= '<tr>';
55
+ $html .= '<td class="label"><label>&nbsp;</label></td>';
56
+ $html .= '<td class="value"><input type="checkbox" id="account-send-pass" name="'
57
+ . $element->getName()
58
+ . '" value="auto" onclick="setElementDisable(\''
59
+ . $element->getHtmlId()
60
+ . '\', this.checked)"/>&nbsp;';
61
+ $html .= '<label for="account-send-pass">'
62
+ . Mage::helper('customer')->__('Send Auto-Generated Password')
63
+ . '</label></td>';
64
+ $html .= '</tr>'."\n";
65
 
66
  return $html;
67
  }
 
68
  }
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -33,6 +33,23 @@ class Mage_Adminhtml_Block_Customer_Edit_Renderer_Region
33
  extends Mage_Adminhtml_Block_Abstract
34
  implements Varien_Data_Form_Element_Renderer_Interface
35
  {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
36
  /**
37
  * Output the region element and javasctipt that makes it dependent from country element
38
  *
@@ -41,14 +58,15 @@ class Mage_Adminhtml_Block_Customer_Edit_Renderer_Region
41
  */
42
  public function render(Varien_Data_Form_Element_Abstract $element)
43
  {
44
- if ($country = $element->getForm()->getElement('country_id')) {
 
45
  $countryId = $country->getValue();
46
- }
47
- else {
48
  return $element->getDefaultHtml();
49
  }
50
 
51
  $regionId = $element->getForm()->getElement('region_id')->getValue();
 
52
 
53
  $html = '<tr>';
54
  $element->setClass('input-text');
@@ -60,13 +78,13 @@ class Mage_Adminhtml_Block_Customer_Edit_Renderer_Region
60
  $selectId = $element->getHtmlId() . '_id';
61
  $html .= '<select id="' . $selectId . '" name="' . $selectName
62
  . '" class="select required-entry" style="display:none">';
63
- $html .= '<option value="">' . Mage::helper('customer')->__('Please select') . '</option>';
64
  $html .= '</select>';
65
 
66
  $html .= '<script type="text/javascript">' . "\n";
67
  $html .= '$("' . $selectId . '").setAttribute("defaultValue", "' . $regionId.'");' . "\n";
68
- $html .= 'new regionUpdater("' . $country->getHtmlId() . '", "' . $element->getHtmlId()
69
- . '", "' . $selectId . '", ' . $this->helper('directory')->getRegionJson() . ');' . "\n";
70
  $html .= '</script>' . "\n";
71
 
72
  $html .= '</td></tr>' . "\n";
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
33
  extends Mage_Adminhtml_Block_Abstract
34
  implements Varien_Data_Form_Element_Renderer_Interface
35
  {
36
+ /**
37
+ * Factory instance
38
+ *
39
+ * @var Mage_Core_Model_Abstract
40
+ */
41
+ protected $_factory;
42
+
43
+ /**
44
+ * Constructor for Mage_Adminhtml_Block_Customer_Edit_Renderer_Region class
45
+ *
46
+ * @param array $args
47
+ */
48
+ public function __construct(array $args = array())
49
+ {
50
+ $this->_factory = !empty($args['factory']) ? $args['factory'] : Mage::getSingleton('core/factory');
51
+ }
52
+
53
  /**
54
  * Output the region element and javasctipt that makes it dependent from country element
55
  *
58
  */
59
  public function render(Varien_Data_Form_Element_Abstract $element)
60
  {
61
+ $country = $element->getForm()->getElement('country_id');
62
+ if (!is_null($country)) {
63
  $countryId = $country->getValue();
64
+ } else {
 
65
  return $element->getDefaultHtml();
66
  }
67
 
68
  $regionId = $element->getForm()->getElement('region_id')->getValue();
69
+ $quoteStoreId = $element->getEntityAttribute()->getStoreId();
70
 
71
  $html = '<tr>';
72
  $element->setClass('input-text');
78
  $selectId = $element->getHtmlId() . '_id';
79
  $html .= '<select id="' . $selectId . '" name="' . $selectName
80
  . '" class="select required-entry" style="display:none">';
81
+ $html .= '<option value="">' . $this->_factory->getHelper('customer')->__('Please select') . '</option>';
82
  $html .= '</select>';
83
 
84
  $html .= '<script type="text/javascript">' . "\n";
85
  $html .= '$("' . $selectId . '").setAttribute("defaultValue", "' . $regionId.'");' . "\n";
86
+ $html .= 'new regionUpdater("' . $country->getHtmlId() . '", "' . $element->getHtmlId() . '", "' .
87
+ $selectId . '", ' . $this->helper('directory')->getRegionJsonByStore($quoteStoreId).');' . "\n";
88
  $html .= '</script>' . "\n";
89
 
90
  $html .= '</td></tr>' . "\n";
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -78,7 +78,7 @@ class Mage_Adminhtml_Block_Customer_Edit_Tab_View
78
  */
79
  public function getCreateDate()
80
  {
81
- return Mage::helper('core')->formatDate($this->getCustomer()->getCreatedAtTimestamp(),
82
  Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true);
83
  }
84
 
@@ -211,4 +211,13 @@ class Mage_Adminhtml_Block_Customer_Edit_Tab_View
211
  return true;
212
  }
213
 
 
 
 
 
 
 
 
 
 
214
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
78
  */
79
  public function getCreateDate()
80
  {
81
+ return $this->_getCoreHelper()->formatDate($this->getCustomer()->getCreatedAt(),
82
  Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true);
83
  }
84
 
211
  return true;
212
  }
213
 
214
+ /**
215
+ * Return instance of core helper
216
+ *
217
+ * @return Mage_Core_Helper_Data
218
+ */
219
+ protected function _getCoreHelper()
220
+ {
221
+ return Mage::helper('core');
222
+ }
223
  }
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -29,11 +29,10 @@
29
  *
30
  * @category Mage
31
  * @package Mage_Adminhtml
32
- * @author Magento Core Team <core@magentocommerce.com>
33
  */
34
  class Mage_Adminhtml_Block_Customer_Edit_Tab_View_Cart extends Mage_Adminhtml_Block_Widget_Grid
35
  {
36
-
37
  public function __construct()
38
  {
39
  parent::__construct();
@@ -47,6 +46,7 @@ class Mage_Adminhtml_Block_Customer_Edit_Tab_View_Cart extends Mage_Adminhtml_Bl
47
 
48
  protected function _prepareCollection()
49
  {
 
50
  $quote = Mage::getModel('sales/quote');
51
  // set website to quote, if any
52
  if ($this->getWebsiteId()) {
@@ -54,12 +54,7 @@ class Mage_Adminhtml_Block_Customer_Edit_Tab_View_Cart extends Mage_Adminhtml_Bl
54
  }
55
  $quote->loadByCustomer(Mage::registry('current_customer'));
56
 
57
- if ($quote) {
58
- $collection = $quote->getItemsCollection(false);
59
- }
60
- else {
61
- $collection = new Varien_Data_Collection();
62
- }
63
 
64
  $collection->addFieldToFilter('parent_item_id', array('null' => true));
65
  $this->setCollection($collection);
@@ -69,55 +64,56 @@ class Mage_Adminhtml_Block_Customer_Edit_Tab_View_Cart extends Mage_Adminhtml_Bl
69
 
70
  protected function _prepareColumns()
71
  {
 
72
  $this->addColumn('product_id', array(
73
  'header' => Mage::helper('customer')->__('Product ID'),
74
  'index' => 'product_id',
75
- 'width' => '100px',
76
- ));
77
-
78
- $this->addColumn('name', array(
79
  'header' => Mage::helper('customer')->__('Product Name'),
80
- 'index' => 'name',
81
- ));
82
-
83
- $this->addColumn('sku', array(
84
  'header' => Mage::helper('customer')->__('SKU'),
85
  'index' => 'sku',
86
- 'width' => '100px',
87
- ));
88
-
89
- $this->addColumn('qty', array(
90
  'header' => Mage::helper('customer')->__('Qty'),
91
  'index' => 'qty',
92
  'type' => 'number',
93
- 'width' => '60px',
94
- ));
95
-
96
- $this->addColumn('price', array(
97
  'header' => Mage::helper('customer')->__('Price'),
98
  'index' => 'price',
99
  'type' => 'currency',
100
- 'currency_code' => (string) Mage::getStoreConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE),
101
- ));
102
-
103
- $this->addColumn('total', array(
104
  'header' => Mage::helper('customer')->__('Total'),
105
  'index' => 'row_total',
106
  'type' => 'currency',
107
- 'currency_code' => (string) Mage::getStoreConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE),
108
  ));
109
 
110
  return parent::_prepareColumns();
111
  }
112
 
 
 
 
 
 
 
113
  public function getRowUrl($row)
114
  {
115
  return $this->getUrl('*/catalog_product/edit', array('id' => $row->getProductId()));
116
  }
117
 
 
 
 
 
 
118
  public function getHeadersVisibility()
119
  {
120
  return ($this->getCollection()->getSize() > 0);
121
  }
122
-
123
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
29
  *
30
  * @category Mage
31
  * @package Mage_Adminhtml
32
+ * @author Magento Core Team <core@magentocommerce.com>
33
  */
34
  class Mage_Adminhtml_Block_Customer_Edit_Tab_View_Cart extends Mage_Adminhtml_Block_Widget_Grid
35
  {
 
36
  public function __construct()
37
  {
38
  parent::__construct();
46
 
47
  protected function _prepareCollection()
48
  {
49
+ /** @var $quote Mage_Sales_Model_Quote */
50
  $quote = Mage::getModel('sales/quote');
51
  // set website to quote, if any
52
  if ($this->getWebsiteId()) {
54
  }
55
  $quote->loadByCustomer(Mage::registry('current_customer'));
56
 
57
+ $collection = $quote ? $quote->getItemsCollection(false) : new Varien_Data_Collection();
 
 
 
 
 
58
 
59
  $collection->addFieldToFilter('parent_item_id', array('null' => true));
60
  $this->setCollection($collection);
64
 
65
  protected function _prepareColumns()
66
  {
67
+ $currencyCode = (string)Mage::getStoreConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE);
68
  $this->addColumn('product_id', array(
69
  'header' => Mage::helper('customer')->__('Product ID'),
70
  'index' => 'product_id',
71
+ 'width' => '100px'
72
+ ))->addColumn('name', array(
 
 
73
  'header' => Mage::helper('customer')->__('Product Name'),
74
+ 'index' => 'name'
75
+ ))->addColumn('sku', array(
 
 
76
  'header' => Mage::helper('customer')->__('SKU'),
77
  'index' => 'sku',
78
+ 'width' => '100px'
79
+ ))->addColumn('qty', array(
 
 
80
  'header' => Mage::helper('customer')->__('Qty'),
81
  'index' => 'qty',
82
  'type' => 'number',
83
+ 'width' => '60px'
84
+ ))->addColumn('price', array(
 
 
85
  'header' => Mage::helper('customer')->__('Price'),
86
  'index' => 'price',
87
  'type' => 'currency',
88
+ 'currency_code' => $currencyCode
89
+ ))->addColumn('total', array(
 
 
90
  'header' => Mage::helper('customer')->__('Total'),
91
  'index' => 'row_total',
92
  'type' => 'currency',
93
+ 'currency_code' => $currencyCode
94
  ));
95
 
96
  return parent::_prepareColumns();
97
  }
98
 
99
+ /**
100
+ * Retrieve row url
101
+ *
102
+ * @param Mage_Sales_Model_Quote_Item $row
103
+ * @return string
104
+ */
105
  public function getRowUrl($row)
106
  {
107
  return $this->getUrl('*/catalog_product/edit', array('id' => $row->getProductId()));
108
  }
109
 
110
+ /**
111
+ * Check weather header should be shown
112
+ *
113
+ * @return bool
114
+ */
115
  public function getHeadersVisibility()
116
  {
117
  return ($this->getCollection()->getSize() > 0);
118
  }
 
119
  }
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -71,7 +71,7 @@ class Mage_Adminhtml_Block_Customer_Edit_Tab_View_Orders extends Mage_Adminhtml_
71
  ));
72
 
73
  $this->addColumn('created_at', array(
74
- 'header' => Mage::helper('customer')->__('Purchased At'),
75
  'index' => 'created_at',
76
  'type' => 'datetime',
77
  ));
@@ -87,7 +87,7 @@ class Mage_Adminhtml_Block_Customer_Edit_Tab_View_Orders extends Mage_Adminhtml_
87
  ));
88
 
89
  $this->addColumn('grand_total', array(
90
- 'header' => Mage::helper('customer')->__('Grand Total'),
91
  'index' => 'grand_total',
92
  'type' => 'currency',
93
  'currency' => 'order_currency_code',
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
71
  ));
72
 
73
  $this->addColumn('created_at', array(
74
+ 'header' => Mage::helper('customer')->__('Purchased On'),
75
  'index' => 'created_at',
76
  'type' => 'datetime',
77
  ));
87
  ));
88
 
89
  $this->addColumn('grand_total', array(
90
+ 'header' => Mage::helper('customer')->__('Order Total'),
91
  'index' => 'grand_total',
92
  'type' => 'currency',
93
  'currency' => 'order_currency_code',
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -86,7 +86,9 @@ class Mage_Adminhtml_Block_Customer_Edit_Tab_Wishlist extends Mage_Adminhtml_Blo
86
  */
87
  protected function _createCollection()
88
  {
89
- return Mage::getModel('wishlist/item')->getCollection();
 
 
90
  }
91
 
92
  /**
@@ -113,13 +115,13 @@ class Mage_Adminhtml_Block_Customer_Edit_Tab_Wishlist extends Mage_Adminhtml_Blo
113
  protected function _prepareColumns()
114
  {
115
  $this->addColumn('product_name', array(
116
- 'header' => Mage::helper('catalog')->__('Product name'),
117
  'index' => 'product_name',
118
  'renderer' => 'adminhtml/customer_edit_tab_view_grid_renderer_item'
119
  ));
120
 
121
  $this->addColumn('description', array(
122
- 'header' => Mage::helper('wishlist')->__('User description'),
123
  'index' => 'description',
124
  'renderer' => 'adminhtml/customer_edit_tab_wishlist_grid_renderer_description'
125
  ));
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
86
  */
87
  protected function _createCollection()
88
  {
89
+ return Mage::getModel('wishlist/item')->getCollection()
90
+ ->setWebsiteId($this->_getCustomer()->getWebsiteId())
91
+ ->setCustomerGroupId($this->_getCustomer()->getGroupId());
92
  }
93
 
94
  /**
115
  protected function _prepareColumns()
116
  {
117
  $this->addColumn('product_name', array(
118
+ 'header' => Mage::helper('catalog')->__('Product Name'),
119
  'index' => 'product_name',
120
  'renderer' => 'adminhtml/customer_edit_tab_view_grid_renderer_item'
121
  ));
122
 
123
  $this->addColumn('description', array(
124
+ 'header' => Mage::helper('wishlist')->__('User Description'),
125
  'index' => 'description',
126
  'renderer' => 'adminhtml/customer_edit_tab_wishlist_grid_renderer_description'
127
  ));
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Group.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -52,7 +52,7 @@ class Mage_Adminhtml_Block_Customer_Group_Edit extends Mage_Adminhtml_Block_Widg
52
  public function getHeaderText()
53
  {
54
  if(!is_null(Mage::registry('current_group')->getId())) {
55
- return Mage::helper('customer')->__('Edit Customer Group "%s"', $this->htmlEscape(Mage::registry('current_group')->getCustomerGroupCode()));
56
  } else {
57
  return Mage::helper('customer')->__('New Customer Group');
58
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
52
  public function getHeaderText()
53
  {
54
  if(!is_null(Mage::registry('current_group')->getId())) {
55
+ return Mage::helper('customer')->__('Edit Customer Group "%s"', $this->escapeHtml(Mage::registry('current_group')->getCustomerGroupCode()));
56
  } else {
57
  return Mage::helper('customer')->__('New Customer Group');
58
  }
app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Online.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -31,16 +31,18 @@
31
  * @category Mage
32
  * @package Mage_Adminhtml
33
  */
34
- class Mage_Adminhtml_Block_Dashboard_Searches_Renderer_Searchquery extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
 
35
  {
36
  public function render(Varien_Object $row)
37
  {
38
  $value = $row->getData($this->getColumn()->getIndex());
39
  if (Mage::helper('core/string')->strlen($value) > 30) {
40
- $value = '<span title="'. $this->htmlEscape($value) .'">' . $this->htmlEscape(Mage::helper('core/string')->truncate($value, 30)) . '</span>';
 
41
  }
42
  else {
43
- $value = $this->htmlEscape($value);
44
  }
45
  return $value;
46
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
31
  * @category Mage
32
  * @package Mage_Adminhtml
33
  */
34
+ class Mage_Adminhtml_Block_Dashboard_Searches_Renderer_Searchquery
35
+ extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
36
  {
37
  public function render(Varien_Object $row)
38
  {
39
  $value = $row->getData($this->getColumn()->getIndex());
40
  if (Mage::helper('core/string')->strlen($value) > 30) {
41
+ $value = '<span title="'. $this->escapeHtml($value) .'">'
42
+ . $this->escapeHtml(Mage::helper('core/string')->truncate($value, 30)) . '</span>';
43
  }
44
  else {
45
+ $value = $this->escapeHtml($value);
46
  }
47
  return $value;
48
  }
app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Denied.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Html/Date.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Html/Select.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Media/Editor.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Media/Uploader.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Messages.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Notification/Baseurl.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Notification/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Notification/Security.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Notification/Survey.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Notification/Window.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Page.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Page/Footer.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Page/Head.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Page/Header.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Page/Menu.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -141,7 +141,7 @@ class Mage_Adminhtml_Block_Page_Menu extends Mage_Adminhtml_Block_Template
141
  }
142
 
143
  $aclResource = 'admin/' . ($child->resource ? (string)$child->resource : $path . $childName);
144
- if (!$this->_checkAcl($aclResource)) {
145
  continue;
146
  }
147
 
@@ -307,4 +307,21 @@ class Mage_Adminhtml_Block_Page_Menu extends Mage_Adminhtml_Block_Template
307
 
308
  return $html;
309
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
310
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
141
  }
142
 
143
  $aclResource = 'admin/' . ($child->resource ? (string)$child->resource : $path . $childName);
144
+ if (!$this->_checkAcl($aclResource) || !$this->_isEnabledModuleOutput($child)) {
145
  continue;
146
  }
147
 
307
 
308
  return $html;
309
  }
310
+
311
+ /**
312
+ * Check is module output enabled
313
+ *
314
+ * @param Varien_Simplexml_Element $child
315
+ * @return bool
316
+ */
317
+ protected function _isEnabledModuleOutput(Varien_Simplexml_Element $child)
318
+ {
319
+ $helperName = 'adminhtml';
320
+ $childAttributes = $child->attributes();
321
+ if (isset($childAttributes['module'])) {
322
+ $helperName = (string)$childAttributes['module'];
323
+ }
324
+
325
+ return Mage::helper($helperName)->isModuleOutputEnabled();
326
+ }
327
  }
app/code/core/Mage/Adminhtml/Block/Page/Notices.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Role.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Permissions_Tab_Useredit extends Mage_Adminhtml_Block_Widget_Form
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Permissions_Tab_Useredit extends Mage_Adminhtml_Block_Widget_Form
app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Permissions_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Permissions_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs
app/code/core/Mage/Adminhtml/Block/Permissions/User.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -48,7 +48,7 @@ class Mage_Adminhtml_Block_Permissions_User_Edit extends Mage_Adminhtml_Block_Wi
48
  public function getHeaderText()
49
  {
50
  if (Mage::registry('permissions_user')->getId()) {
51
- return Mage::helper('adminhtml')->__("Edit User '%s'", $this->htmlEscape(Mage::registry('permissions_user')->getUsername()));
52
  }
53
  else {
54
  return Mage::helper('adminhtml')->__('New User');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
48
  public function getHeaderText()
49
  {
50
  if (Mage::registry('permissions_user')->getId()) {
51
+ return Mage::helper('adminhtml')->__("Edit User '%s'", $this->escapeHtml(Mage::registry('permissions_user')->getUsername()));
52
  }
53
  else {
54
  return Mage::helper('adminhtml')->__('New User');
app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Permissions_UsernRoles extends Mage_Adminhtml_Block_Template
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Permissions_UsernRoles extends Mage_Adminhtml_Block_Template
app/code/core/Mage/Adminhtml/Block/Permissions/Users.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -55,7 +55,7 @@ class Mage_Adminhtml_Block_Poll_Answer_Edit extends Mage_Adminhtml_Block_Widget_
55
 
56
  public function getHeaderText()
57
  {
58
- return Mage::helper('poll')->__("Edit Answer '%s'", $this->htmlEscape(Mage::registry('answer_data')->getAnswerTitle()));
59
  }
60
 
61
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
55
 
56
  public function getHeaderText()
57
  {
58
+ return Mage::helper('poll')->__("Edit Answer '%s'", $this->escapeHtml(Mage::registry('answer_data')->getAnswerTitle()));
59
  }
60
 
61
  }
app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Poll/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -50,7 +50,7 @@ class Mage_Adminhtml_Block_Poll_Edit extends Mage_Adminhtml_Block_Widget_Form_Co
50
  public function getHeaderText()
51
  {
52
  if( Mage::registry('poll_data') && Mage::registry('poll_data')->getId() ) {
53
- return Mage::helper('poll')->__("Edit Poll '%s'", $this->htmlEscape(Mage::registry('poll_data')->getPollTitle()));
54
  } else {
55
  return Mage::helper('poll')->__('New Poll');
56
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
50
  public function getHeaderText()
51
  {
52
  if( Mage::registry('poll_data') && Mage::registry('poll_data')->getId() ) {
53
+ return Mage::helper('poll')->__("Edit Poll '%s'", $this->escapeHtml(Mage::registry('poll_data')->getPollTitle()));
54
  } else {
55
  return Mage::helper('poll')->__('New Poll');
56
  }
app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Poll/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Poll/Poll.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Js.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Rating/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -57,7 +57,7 @@ class Mage_Adminhtml_Block_Rating_Edit extends Mage_Adminhtml_Block_Widget_Form_
57
  public function getHeaderText()
58
  {
59
  if( Mage::registry('rating_data') && Mage::registry('rating_data')->getId() ) {
60
- return Mage::helper('rating')->__("Edit Rating", $this->htmlEscape(Mage::registry('rating_data')->getRatingCode()));
61
  } else {
62
  return Mage::helper('rating')->__('New Rating');
63
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
57
  public function getHeaderText()
58
  {
59
  if( Mage::registry('rating_data') && Mage::registry('rating_data')->getId() ) {
60
+ return Mage::helper('rating')->__("Edit Rating", $this->escapeHtml(Mage::registry('rating_data')->getRatingCode()));
61
  } else {
62
  return Mage::helper('rating')->__('New Rating');
63
  }
app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Rating/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Rating/Rating.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Search.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -47,7 +47,6 @@ class Mage_Adminhtml_Block_Report_Tag_Customer_Detail_Grid extends Mage_Adminhtm
47
  ->joinAttribute('original_name', 'catalog_product/name', 'entity_id')
48
  ->addCustomerFilter($this->getRequest()->getParam('id'))
49
  ->addStatusFilter(Mage_Tag_Model_Tag::STATUS_APPROVED)
50
- ->setDescOrder('DESC')
51
  ->addStoresVisibility()
52
  ->setActiveFilter()
53
  ->addGroupByTag()
@@ -62,28 +61,25 @@ class Mage_Adminhtml_Block_Report_Tag_Customer_Detail_Grid extends Mage_Adminhtm
62
  {
63
  $this->addColumn('name', array(
64
  'header' =>Mage::helper('reports')->__('Product Name'),
65
- 'sortable' => false,
66
  'index' =>'original_name'
67
  ));
68
 
69
  $this->addColumn('tag_name', array(
70
  'header' =>Mage::helper('reports')->__('Tag Name'),
71
- 'sortable' => false,
72
  'index' =>'tag_name'
73
  ));
74
 
75
  if (!Mage::app()->isSingleStoreMode()) {
76
  $this->addColumn('visible', array(
77
  'header' => Mage::helper('reports')->__('Visible In'),
78
- 'sortable' => false,
79
  'index' => 'stores',
80
  'type' => 'store',
 
81
  'store_view'=> true
82
  ));
83
 
84
  $this->addColumn('added_in', array(
85
  'header' =>Mage::helper('reports')->__('Submitted In'),
86
- 'sortable' => false,
87
  'index' =>'store_id',
88
  'type' =>'store',
89
  'store_view'=>true
@@ -92,7 +88,6 @@ class Mage_Adminhtml_Block_Report_Tag_Customer_Detail_Grid extends Mage_Adminhtm
92
 
93
  $this->addColumn('created_at', array(
94
  'header' =>Mage::helper('reports')->__('Submitted On'),
95
- 'sortable' => false,
96
  'width' => '140px',
97
  'type' => 'datetime',
98
  'index' => 'created_at'
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
47
  ->joinAttribute('original_name', 'catalog_product/name', 'entity_id')
48
  ->addCustomerFilter($this->getRequest()->getParam('id'))
49
  ->addStatusFilter(Mage_Tag_Model_Tag::STATUS_APPROVED)
 
50
  ->addStoresVisibility()
51
  ->setActiveFilter()
52
  ->addGroupByTag()
61
  {
62
  $this->addColumn('name', array(
63
  'header' =>Mage::helper('reports')->__('Product Name'),
 
64
  'index' =>'original_name'
65
  ));
66
 
67
  $this->addColumn('tag_name', array(
68
  'header' =>Mage::helper('reports')->__('Tag Name'),
 
69
  'index' =>'tag_name'
70
  ));
71
 
72
  if (!Mage::app()->isSingleStoreMode()) {
73
  $this->addColumn('visible', array(
74
  'header' => Mage::helper('reports')->__('Visible In'),
 
75
  'index' => 'stores',
76
  'type' => 'store',
77
+ 'sortable' => false,
78
  'store_view'=> true
79
  ));
80
 
81
  $this->addColumn('added_in', array(
82
  'header' =>Mage::helper('reports')->__('Submitted In'),
 
83
  'index' =>'store_id',
84
  'type' =>'store',
85
  'store_view'=>true
88
 
89
  $this->addColumn('created_at', array(
90
  'header' =>Mage::helper('reports')->__('Submitted On'),
 
91
  'width' => '140px',
92
  'type' => 'datetime',
93
  'index' => 'created_at'
app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -50,9 +50,8 @@ class Mage_Adminhtml_Block_Report_Tag_Popular_Detail_Grid extends Mage_Adminhtml
50
  /* @var $collection Mage_Reports_Model_Resource_Tag_Customer_Collection */
51
  $collection = Mage::getResourceModel('reports/tag_customer_collection');
52
  $collection->addStatusFilter(Mage::getModel('tag/tag')->getApprovedStatus())
53
- ->addTagFilter($this->getRequest()->getParam('id'))
54
- ->addDescOrder()
55
- ->addProductName();
56
 
57
  $this->setCollection($collection);
58
 
@@ -69,27 +68,23 @@ class Mage_Adminhtml_Block_Report_Tag_Popular_Detail_Grid extends Mage_Adminhtml
69
 
70
  $this->addColumn('firstname', array(
71
  'header' =>Mage::helper('reports')->__('First Name'),
72
- 'sortable' => false,
73
  'index' =>'firstname'
74
  ));
75
 
76
  $this->addColumn('lastname', array(
77
  'header' =>Mage::helper('reports')->__('Last Name'),
78
- 'sortable' => false,
79
  'index' =>'lastname'
80
  ));
81
 
82
  $this->addColumn('product', array(
83
  'header' =>Mage::helper('reports')->__('Product Name'),
84
- 'sortable' => false,
85
- 'index' =>'product'
86
  ));
87
 
88
  if (!Mage::app()->isSingleStoreMode()) {
89
  $this->addColumn('added_in', array(
90
  'header' => Mage::helper('reports')->__('Submitted In'),
91
- 'sortable' => false,
92
- 'index' => 'store_id',
93
  'type' => 'store',
94
  'store_view'=> true
95
  ));
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
50
  /* @var $collection Mage_Reports_Model_Resource_Tag_Customer_Collection */
51
  $collection = Mage::getResourceModel('reports/tag_customer_collection');
52
  $collection->addStatusFilter(Mage::getModel('tag/tag')->getApprovedStatus())
53
+ ->addTagFilter($this->getRequest()->getParam('id'))
54
+ ->addProductToSelect();
 
55
 
56
  $this->setCollection($collection);
57
 
68
 
69
  $this->addColumn('firstname', array(
70
  'header' =>Mage::helper('reports')->__('First Name'),
 
71
  'index' =>'firstname'
72
  ));
73
 
74
  $this->addColumn('lastname', array(
75
  'header' =>Mage::helper('reports')->__('Last Name'),
 
76
  'index' =>'lastname'
77
  ));
78
 
79
  $this->addColumn('product', array(
80
  'header' =>Mage::helper('reports')->__('Product Name'),
81
+ 'index' =>'product_name'
 
82
  ));
83
 
84
  if (!Mage::app()->isSingleStoreMode()) {
85
  $this->addColumn('added_in', array(
86
  'header' => Mage::helper('reports')->__('Submitted In'),
87
+ 'index' => 'added_in',
 
88
  'type' => 'store',
89
  'store_view'=> true
90
  ));
app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -65,7 +65,6 @@ class Mage_Adminhtml_Block_Report_Tag_Popular_Grid extends Mage_Adminhtml_Block_
65
  {
66
  $this->addColumn('name', array(
67
  'header' =>Mage::helper('reports')->__('Tag Name'),
68
- 'sortable' =>false,
69
  'index' =>'name'
70
  ));
71
 
@@ -73,7 +72,6 @@ class Mage_Adminhtml_Block_Report_Tag_Popular_Grid extends Mage_Adminhtml_Block_
73
  'header' =>Mage::helper('reports')->__('Popularity'),
74
  'width' =>'50px',
75
  'align' =>'right',
76
- 'sortable' =>false,
77
  'index' =>'popularity'
78
  ));
79
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
65
  {
66
  $this->addColumn('name', array(
67
  'header' =>Mage::helper('reports')->__('Tag Name'),
 
68
  'index' =>'name'
69
  ));
70
 
72
  'header' =>Mage::helper('reports')->__('Popularity'),
73
  'width' =>'50px',
74
  'align' =>'right',
 
75
  'index' =>'popularity'
76
  ));
77
 
app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -75,7 +75,7 @@ class Mage_Adminhtml_Block_Report_Tag_Product_Detail_Grid extends Mage_Adminhtml
75
  $this->addColumn('visible', array(
76
  'header' => Mage::helper('reports')->__('Visible In'),
77
  'sortable' => false,
78
- 'index' => 'stores',
79
  'type' => 'store',
80
  'store_view'=> true
81
  ));
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
75
  $this->addColumn('visible', array(
76
  'header' => Mage::helper('reports')->__('Visible In'),
77
  'sortable' => false,
78
+ 'index' => 'stores',
79
  'type' => 'store',
80
  'store_view'=> true
81
  ));
app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Review/Add.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -36,11 +36,6 @@ class Mage_Adminhtml_Block_Review_Add_Form extends Mage_Adminhtml_Block_Widget_F
36
  {
37
  protected function _prepareForm()
38
  {
39
- $statuses = Mage::getModel('review/review')
40
- ->getStatusCollection()
41
- ->load()
42
- ->toOptionArray();
43
-
44
  $form = new Varien_Data_Form();
45
 
46
  $fieldset = $form->addFieldset('add_review_form', array('legend' => Mage::helper('review')->__('Review Details')));
@@ -61,7 +56,7 @@ class Mage_Adminhtml_Block_Review_Add_Form extends Mage_Adminhtml_Block_Widget_F
61
  'label' => Mage::helper('review')->__('Status'),
62
  'required' => true,
63
  'name' => 'status_id',
64
- 'values' => $statuses,
65
  ));
66
 
67
  /**
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
36
  {
37
  protected function _prepareForm()
38
  {
 
 
 
 
 
39
  $form = new Varien_Data_Form();
40
 
41
  $fieldset = $form->addFieldset('add_review_form', array('legend' => Mage::helper('review')->__('Review Details')));
56
  'label' => Mage::helper('review')->__('Status'),
57
  'required' => true,
58
  'name' => 'status_id',
59
+ 'values' => Mage::helper('review')->getReviewStatusesOptionArray(),
60
  ));
61
 
62
  /**
app/code/core/Mage/Adminhtml/Block/Review/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -46,19 +46,47 @@ class Mage_Adminhtml_Block_Review_Edit extends Mage_Adminhtml_Block_Widget_Form_
46
  $this->_updateButton('delete', 'label', Mage::helper('review')->__('Delete Review'));
47
 
48
  if( $this->getRequest()->getParam('productId', false) ) {
49
- $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('*/catalog_product/edit', array('id' => $this->getRequest()->getParam('productId', false))) .'\')' );
 
 
 
 
 
 
 
 
 
50
  }
51
 
52
  if( $this->getRequest()->getParam('customerId', false) ) {
53
- $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('*/customer/edit', array('id' => $this->getRequest()->getParam('customerId', false))) .'\')' );
 
 
 
 
 
 
 
 
 
54
  }
55
 
56
  if( $this->getRequest()->getParam('ret', false) == 'pending' ) {
57
  $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('*/*/pending') .'\')' );
58
- $this->_updateButton('delete', 'onclick', 'deleteConfirm(\'' . Mage::helper('review')->__('Are you sure you want to do this?') . '\', \'' . $this->getUrl('*/*/delete', array(
59
- $this->_objectId => $this->getRequest()->getParam($this->_objectId),
60
- 'ret' => 'pending',
61
- )) .'\')' );
 
 
 
 
 
 
 
 
 
 
62
  Mage::register('ret', 'pending');
63
  }
64
 
@@ -71,9 +99,20 @@ class Mage_Adminhtml_Block_Review_Edit extends Mage_Adminhtml_Block_Widget_Form_
71
  $this->_formInitScripts[] = '
72
  var review = {
73
  updateRating: function() {
74
- elements = [$("select_stores"), $("rating_detail").getElementsBySelector("input[type=\'radio\']")].flatten();
 
 
 
75
  $(\'save_button\').disabled = true;
76
- new Ajax.Updater("rating_detail", "'.$this->getUrl('*/*/ratingItems', array('_current'=>true)).'", {parameters:Form.serializeElements(elements), evalScripts:true, onComplete:function(){ $(\'save_button\').disabled = false; } });
 
 
 
 
 
 
 
 
77
  }
78
  }
79
  Event.observe(window, \'load\', function(){
@@ -85,7 +124,7 @@ class Mage_Adminhtml_Block_Review_Edit extends Mage_Adminhtml_Block_Widget_Form_
85
  public function getHeaderText()
86
  {
87
  if( Mage::registry('review_data') && Mage::registry('review_data')->getId() ) {
88
- return Mage::helper('review')->__("Edit Review '%s'", $this->htmlEscape(Mage::registry('review_data')->getTitle()));
89
  } else {
90
  return Mage::helper('review')->__('New Review');
91
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
46
  $this->_updateButton('delete', 'label', Mage::helper('review')->__('Delete Review'));
47
 
48
  if( $this->getRequest()->getParam('productId', false) ) {
49
+ $this->_updateButton(
50
+ 'back',
51
+ 'onclick',
52
+ 'setLocation(\''
53
+ . $this->getUrl(
54
+ '*/catalog_product/edit',
55
+ array('id' => $this->getRequest()->getParam('productId', false))
56
+ )
57
+ .'\')'
58
+ );
59
  }
60
 
61
  if( $this->getRequest()->getParam('customerId', false) ) {
62
+ $this->_updateButton(
63
+ 'back',
64
+ 'onclick',
65
+ 'setLocation(\''
66
+ . $this->getUrl(
67
+ '*/customer/edit',
68
+ array('id' => $this->getRequest()->getParam('customerId', false))
69
+ )
70
+ .'\')'
71
+ );
72
  }
73
 
74
  if( $this->getRequest()->getParam('ret', false) == 'pending' ) {
75
  $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('*/*/pending') .'\')' );
76
+ $this->_updateButton(
77
+ 'delete',
78
+ 'onclick',
79
+ 'deleteConfirm('
80
+ . '\'' . Mage::helper('review')->__('Are you sure you want to do this?').'\' '
81
+ . '\'' . $this->getUrl(
82
+ '*/*/delete',
83
+ array(
84
+ $this->_objectId => $this->getRequest()->getParam($this->_objectId),
85
+ 'ret' => 'pending',
86
+ )
87
+ ) . '\''
88
+ . ')'
89
+ );
90
  Mage::register('ret', 'pending');
91
  }
92
 
99
  $this->_formInitScripts[] = '
100
  var review = {
101
  updateRating: function() {
102
+ elements = [
103
+ $("select_stores"),
104
+ $("rating_detail").getElementsBySelector("input[type=\'radio\']")
105
+ ].flatten();
106
  $(\'save_button\').disabled = true;
107
+ new Ajax.Updater(
108
+ "rating_detail",
109
+ "' . $this->getUrl('*/*/ratingItems', array('_current'=>true)).'",
110
+ {
111
+ parameters:Form.serializeElements(elements),
112
+ evalScripts:true,
113
+ onComplete:function(){ $(\'save_button\').disabled = false; }
114
+ }
115
+ );
116
  }
117
  }
118
  Event.observe(window, \'load\', function(){
124
  public function getHeaderText()
125
  {
126
  if( Mage::registry('review_data') && Mage::registry('review_data')->getId() ) {
127
+ return Mage::helper('review')->__("Edit Review '%s'", $this->escapeHtml(Mage::registry('review_data')->getTitle()));
128
  } else {
129
  return Mage::helper('review')->__('New Review');
130
  }
app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -39,10 +39,6 @@ class Mage_Adminhtml_Block_Review_Edit_Form extends Mage_Adminhtml_Block_Widget_
39
  $review = Mage::registry('review_data');
40
  $product = Mage::getModel('catalog/product')->load($review->getEntityPkValue());
41
  $customer = Mage::getModel('customer/customer')->load($review->getCustomerId());
42
- $statuses = Mage::getModel('review/review')
43
- ->getStatusCollection()
44
- ->load()
45
- ->toOptionArray();
46
 
47
  $form = new Varien_Data_Form(array(
48
  'id' => 'edit_form',
@@ -89,7 +85,7 @@ class Mage_Adminhtml_Block_Review_Edit_Form extends Mage_Adminhtml_Block_Widget_
89
  'label' => Mage::helper('review')->__('Status'),
90
  'required' => true,
91
  'name' => 'status_id',
92
- 'values' => Mage::helper('review')->translateArray($statuses),
93
  ));
94
 
95
  /**
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
39
  $review = Mage::registry('review_data');
40
  $product = Mage::getModel('catalog/product')->load($review->getEntityPkValue());
41
  $customer = Mage::getModel('customer/customer')->load($review->getCustomerId());
 
 
 
 
42
 
43
  $form = new Varien_Data_Form(array(
44
  'id' => 'edit_form',
85
  'label' => Mage::helper('review')->__('Status'),
86
  'required' => true,
87
  'name' => 'status_id',
88
+ 'values' => Mage::helper('review')->getReviewStatusesOptionArray(),
89
  ));
90
 
91
  /**
app/code/core/Mage/Adminhtml/Block/Review/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -76,18 +76,6 @@ class Mage_Adminhtml_Block_Review_Grid extends Mage_Adminhtml_Block_Widget_Grid
76
 
77
  protected function _prepareColumns()
78
  {
79
- $statuses = Mage::getModel('review/review')
80
- ->getStatusCollection()
81
- ->load()
82
- ->toOptionArray();
83
-
84
- $tmpArr = array();
85
- foreach( $statuses as $key => $status ) {
86
- $tmpArr[$status['value']] = $status['label'];
87
- }
88
-
89
- $statuses = $tmpArr;
90
-
91
  $this->addColumn('review_id', array(
92
  'header' => Mage::helper('review')->__('ID'),
93
  'align' => 'right',
@@ -110,7 +98,7 @@ class Mage_Adminhtml_Block_Review_Grid extends Mage_Adminhtml_Block_Widget_Grid
110
  'header' => Mage::helper('review')->__('Status'),
111
  'align' => 'left',
112
  'type' => 'options',
113
- 'options' => $statuses,
114
  'width' => '100px',
115
  'filter_index' => 'rt.status_id',
116
  'index' => 'status_id',
@@ -232,10 +220,7 @@ class Mage_Adminhtml_Block_Review_Grid extends Mage_Adminhtml_Block_Widget_Grid
232
  'confirm' => Mage::helper('review')->__('Are you sure?')
233
  ));
234
 
235
- $statuses = Mage::getModel('review/review')
236
- ->getStatusCollection()
237
- ->load()
238
- ->toOptionArray();
239
  array_unshift($statuses, array('label'=>'', 'value'=>''));
240
  $this->getMassactionBlock()->addItem('update_status', array(
241
  'label' => Mage::helper('review')->__('Update Status'),
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
76
 
77
  protected function _prepareColumns()
78
  {
 
 
 
 
 
 
 
 
 
 
 
 
79
  $this->addColumn('review_id', array(
80
  'header' => Mage::helper('review')->__('ID'),
81
  'align' => 'right',
98
  'header' => Mage::helper('review')->__('Status'),
99
  'align' => 'left',
100
  'type' => 'options',
101
+ 'options' => Mage::helper('review')->getReviewStatuses(),
102
  'width' => '100px',
103
  'filter_index' => 'rt.status_id',
104
  'index' => 'status_id',
220
  'confirm' => Mage::helper('review')->__('Are you sure?')
221
  ));
222
 
223
+ $statuses = Mage::helper('review')->getReviewStatusesOptionArray();
 
 
 
224
  array_unshift($statuses, array('label'=>'', 'value'=>''));
225
  $this->getMassactionBlock()->addItem('update_status', array(
226
  'label' => Mage::helper('review')->__('Update Status'),
app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Review/Main.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -36,14 +36,12 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Billing_Method_Form extends Mage_P
36
  /**
37
  * Check payment method model
38
  *
 
39
  * @return bool
40
  */
41
  protected function _canUseMethod($method)
42
  {
43
- if (!$method->canUseInternal()) {
44
- return false;
45
- }
46
- return parent::_canUseMethod($method);
47
  }
48
 
49
  /**
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
36
  /**
37
  * Check payment method model
38
  *
39
+ * @param Mage_Payment_Model_Method_Abstract|null $method
40
  * @return bool
41
  */
42
  protected function _canUseMethod($method)
43
  {
44
+ return $method && $method->canUseInternal() && parent::_canUseMethod($method);
 
 
 
45
  }
46
 
47
  /**
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -45,7 +45,7 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Comment extends Mage_Adminhtml_Blo
45
 
46
  public function getCommentNote()
47
  {
48
- return $this->htmlEscape($this->getQuote()->getCustomerNote());
49
  }
50
 
51
  public function getNoteNotify()
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
45
 
46
  public function getCommentNote()
47
  {
48
+ return $this->escapeHtml($this->getQuote()->getCustomerNote());
49
  }
50
 
51
  public function getNoteNotify()
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -216,6 +216,6 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Form_Address
216
  */
217
  public function getAddressAsString($address)
218
  {
219
- return $this->htmlEscape($address->format('oneline'));
220
  }
221
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
216
  */
217
  public function getAddressAsString($address)
218
  {
219
+ return $this->escapeHtml($address->format('oneline'));
220
  }
221
  }
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -55,7 +55,7 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Header extends Mage_Adminhtml_Bloc
55
  else {
56
  $out.= Mage::helper('sales')->__('Create New Order');
57
  }
58
- $out = $this->htmlEscape($out);
59
  $out = '<h3 class="icon-head head-sales-order">' . $out . '</h3>';
60
  return $out;
61
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
55
  else {
56
  $out.= Mage::helper('sales')->__('Create New Order');
57
  }
58
+ $out = $this->escapeHtml($out);
59
  $out = '<h3 class="icon-head head-sales-order">' . $out . '</h3>';
60
  return $out;
61
  }
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -29,7 +29,7 @@
29
  *
30
  * @category Mage
31
  * @package Mage_Adminhtml
32
- * @author Magento Core Team <core@magentocommerce.com>
33
  */
34
  class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract
35
  {
@@ -40,12 +40,20 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
40
  */
41
  protected $_moveToCustomerStorage = true;
42
 
 
 
 
43
  public function __construct()
44
  {
45
  parent::__construct();
46
  $this->setId('sales_order_create_search_grid');
47
  }
48
 
 
 
 
 
 
49
  public function getItems()
50
  {
51
  $items = $this->getParentBlock()->getItems();
@@ -72,41 +80,69 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
72
  return $items;
73
  }
74
 
 
 
 
 
 
75
  public function getSession()
76
  {
77
  return $this->getParentBlock()->getSession();
78
  }
79
 
 
 
 
 
 
 
80
  public function getItemEditablePrice($item)
81
  {
82
- return $item->getCalculationPrice()*1;
83
  }
84
 
 
 
 
 
 
 
85
  public function getOriginalEditablePrice($item)
86
  {
87
  if ($item->hasOriginalCustomPrice()) {
88
- $result = $item->getOriginalCustomPrice()*1;
89
  } elseif ($item->hasCustomPrice()) {
90
- $result = $item->getCustomPrice()*1;
91
  } else {
92
  if (Mage::helper('tax')->priceIncludesTax($this->getStore())) {
93
- $result = $item->getPriceInclTax()*1;
94
  } else {
95
- $result = $item->getOriginalPrice()*1;
96
  }
97
  }
98
  return $result;
99
  }
100
 
 
 
 
 
 
 
101
  public function getItemOrigPrice($item)
102
  {
103
- // return $this->convertPrice($item->getProduct()->getPrice());
104
  return $this->convertPrice($item->getPrice());
105
  }
106
 
107
- public function isGiftMessagesAvailable($item=null)
 
 
 
 
 
 
108
  {
109
- if(is_null($item)) {
110
  return $this->helper('giftmessage/message')->getIsMessagesAvailable(
111
  'items', $this->getQuote(), $this->getStore()
112
  );
@@ -117,6 +153,12 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
117
  );
118
  }
119
 
 
 
 
 
 
 
120
  public function isAllowedForGiftMessage($item)
121
  {
122
  return Mage::getSingleton('adminhtml/giftmessage_save')->getIsAllowedQuoteItem($item);
@@ -134,6 +176,11 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
134
  return $res;
135
  }
136
 
 
 
 
 
 
137
  public function getSubtotal()
138
  {
139
  $address = $this->getQuoteAddress();
@@ -148,23 +195,51 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
148
  return false;
149
  }
150
 
 
 
 
 
 
151
  public function getSubtotalWithDiscount()
152
  {
153
  $address = $this->getQuoteAddress();
154
  if ($this->displayTotalsIncludeTax()) {
155
- return $address->getSubtotal()+$address->getTaxAmount()+$this->getDiscountAmount();
 
 
 
 
156
  } else {
157
- return $address->getSubtotal()+$this->getDiscountAmount();
 
 
 
 
158
  }
159
  }
160
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
161
  public function getDiscountAmount()
162
  {
163
  return $this->getQuote()->getShippingAddress()->getDiscountAmount();
164
  }
165
 
166
  /**
167
- * Retrive quote address
168
  *
169
  * @return Mage_Sales_Model_Quote_Address
170
  */
@@ -200,13 +275,19 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
200
  return !$item->isChildrenCalculated();
201
  }
202
 
 
 
 
 
 
 
203
  public function getQtyTitle($item)
204
  {
205
  $prices = $item->getProduct()->getTierPrice();
206
  if ($prices) {
207
  $info = array();
208
  foreach ($prices as $data) {
209
- $qty = $data['price_qty']*1;
210
  $price = $this->convertPrice($data['price']);
211
  $info[] = $this->helper('sales')->__('Buy %s for price %s', $qty, $price);
212
  }
@@ -217,13 +298,19 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
217
  }
218
  }
219
 
 
 
 
 
 
 
220
  public function getTierHtml($item)
221
  {
222
  $html = '';
223
  $prices = $item->getProduct()->getTierPrice();
224
  if ($prices) {
225
  foreach ($prices as $data) {
226
- $qty = $data['price_qty']*1;
227
  $price = $this->convertPrice($data['price']);
228
  $info[] = $this->helper('sales')->__('%s for %s', $qty, $price);
229
  }
@@ -242,9 +329,11 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
242
  {
243
  $optionStr = '';
244
  $this->_moveToCustomerStorage = true;
245
- if ($optionIds = $item->getOptionByCode('option_ids')) {
 
246
  foreach (explode(',', $optionIds->getValue()) as $optionId) {
247
- if ($option = $item->getProduct()->getOptionById($optionId)) {
 
248
  $optionValue = $item->getOptionByCode('option_' . $option->getId())->getValue();
249
 
250
  $optionStr .= $option->getTitle() . ':';
@@ -272,6 +361,12 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
272
  return $this->_moveToCustomerStorage;
273
  }
274
 
 
 
 
 
 
 
275
  public function displaySubtotalInclTax($item)
276
  {
277
  if ($item->getTaxBeforeDiscount()) {
@@ -282,21 +377,38 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
282
  return $this->formatPrice($item->getRowTotal() + $tax);
283
  }
284
 
 
 
 
 
 
 
285
  public function displayOriginalPriceInclTax($item)
286
  {
287
  $tax = 0;
288
  if ($item->getTaxPercent()) {
289
  $tax = $item->getPrice() * ($item->getTaxPercent() / 100);
290
  }
291
- return $this->convertPrice($item->getPrice()+($tax/$item->getQty()));
292
  }
293
 
 
 
 
 
 
 
294
  public function displayRowTotalWithDiscountInclTax($item)
295
  {
296
  $tax = ($item->getTaxAmount() ? $item->getTaxAmount() : 0);
297
  return $this->formatPrice($item->getRowTotal()-$item->getDiscountAmount()+$tax);
298
  }
299
 
 
 
 
 
 
300
  public function getInclExclTaxMessage()
301
  {
302
  if (Mage::helper('tax')->priceIncludesTax($this->getStore())) {
@@ -306,6 +418,11 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
306
  }
307
  }
308
 
 
 
 
 
 
309
  public function getStore()
310
  {
311
  return $this->getQuote()->getStore();
@@ -314,7 +431,7 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
314
  /**
315
  * Return html button which calls configure window
316
  *
317
- * @param $item
318
  * @return string
319
  */
320
  public function getConfigureButtonHtml($item)
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
29
  *
30
  * @category Mage
31
  * @package Mage_Adminhtml
32
+ * @author Magento Core Team <core@magentocommerce.com>
33
  */
34
  class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract
35
  {
40
  */
41
  protected $_moveToCustomerStorage = true;
42
 
43
+ /**
44
+ * Class constructor
45
+ */
46
  public function __construct()
47
  {
48
  parent::__construct();
49
  $this->setId('sales_order_create_search_grid');
50
  }
51
 
52
+ /**
53
+ * Returns the items
54
+ *
55
+ * @return array
56
+ */
57
  public function getItems()
58
  {
59
  $items = $this->getParentBlock()->getItems();
80
  return $items;
81
  }
82
 
83
+ /**
84
+ * Returns the session
85
+ *
86
+ * @return Mage_Persistent_Helper_Session
87
+ */
88
  public function getSession()
89
  {
90
  return $this->getParentBlock()->getSession();
91
  }
92
 
93
+ /**
94
+ * Returns the item's calculation price
95
+ *
96
+ * @param Mage_Sales_Model_Quote_Item $item
97
+ * @return float
98
+ */
99
  public function getItemEditablePrice($item)
100
  {
101
+ return $item->getCalculationPrice() * 1;
102
  }
103
 
104
+ /**
105
+ * Returns the item's original editable price
106
+ *
107
+ * @param Mage_Sales_Model_Quote_Item $item
108
+ * @return float
109
+ */
110
  public function getOriginalEditablePrice($item)
111
  {
112
  if ($item->hasOriginalCustomPrice()) {
113
+ $result = $item->getOriginalCustomPrice() * 1;
114
  } elseif ($item->hasCustomPrice()) {
115
+ $result = $item->getCustomPrice() * 1;
116
  } else {
117
  if (Mage::helper('tax')->priceIncludesTax($this->getStore())) {
118
+ $result = $item->getPriceInclTax() * 1;
119
  } else {
120
+ $result = $item->getOriginalPrice() * 1;
121
  }
122
  }
123
  return $result;
124
  }
125
 
126
+ /**
127
+ * Returns the item's original price
128
+ *
129
+ * @param Mage_Sales_Model_Quote_Item $item
130
+ * @return double
131
+ */
132
  public function getItemOrigPrice($item)
133
  {
 
134
  return $this->convertPrice($item->getPrice());
135
  }
136
 
137
+ /**
138
+ * Returns whether the item's gift message is available
139
+ *
140
+ * @param null|Mage_Sales_Model_Quote_Item $item
141
+ * @return bool
142
+ */
143
+ public function isGiftMessagesAvailable($item = null)
144
  {
145
+ if (is_null($item)) {
146
  return $this->helper('giftmessage/message')->getIsMessagesAvailable(
147
  'items', $this->getQuote(), $this->getStore()
148
  );
153
  );
154
  }
155
 
156
+ /**
157
+ * Returns whether the item is allowed for the gift message
158
+ *
159
+ * @param Mage_Sales_Model_Quote_Item $item
160
+ * @return bool
161
+ */
162
  public function isAllowedForGiftMessage($item)
163
  {
164
  return Mage::getSingleton('adminhtml/giftmessage_save')->getIsAllowedQuoteItem($item);
176
  return $res;
177
  }
178
 
179
+ /**
180
+ * Returns the subtotal
181
+ *
182
+ * @return float
183
+ */
184
  public function getSubtotal()
185
  {
186
  $address = $this->getQuoteAddress();
195
  return false;
196
  }
197
 
198
+ /**
199
+ * Returns the subtotal with any discount removed
200
+ *
201
+ * @return float
202
+ */
203
  public function getSubtotalWithDiscount()
204
  {
205
  $address = $this->getQuoteAddress();
206
  if ($this->displayTotalsIncludeTax()) {
207
+ if ($this->getIsPriceInclTax()) {
208
+ return $address->getSubtotalInclTax() + $this->getDiscountAmount();
209
+ } else {
210
+ return $address->getSubtotal() + $address->getTaxAmount() + $this->getDiscountAmount();
211
+ }
212
  } else {
213
+ if ($this->getIsPriceInclTax()) {
214
+ return $address->getSubtotalInclTax() - $address->getTaxAmount() + $this->getDiscountAmount();
215
+ } else {
216
+ return $address->getSubtotal() + $this->getDiscountAmount();
217
+ }
218
  }
219
  }
220
 
221
+ /**
222
+ * Return whether the catalog prices include tax
223
+ *
224
+ * @return bool
225
+ */
226
+ public function getIsPriceInclTax()
227
+ {
228
+ return Mage::getSingleton('tax/config')->priceIncludesTax($this->getStore());
229
+ }
230
+
231
+ /**
232
+ * Returns the discount amount
233
+ *
234
+ * @return float
235
+ */
236
  public function getDiscountAmount()
237
  {
238
  return $this->getQuote()->getShippingAddress()->getDiscountAmount();
239
  }
240
 
241
  /**
242
+ * Retrieve quote address
243
  *
244
  * @return Mage_Sales_Model_Quote_Address
245
  */
275
  return !$item->isChildrenCalculated();
276
  }
277
 
278
+ /**
279
+ * Returns the string that contains the 'quantity' title
280
+ *
281
+ * @param Mage_Sales_Model_Quote_Item $item
282
+ * @return string
283
+ */
284
  public function getQtyTitle($item)
285
  {
286
  $prices = $item->getProduct()->getTierPrice();
287
  if ($prices) {
288
  $info = array();
289
  foreach ($prices as $data) {
290
+ $qty = $data['price_qty'] * 1;
291
  $price = $this->convertPrice($data['price']);
292
  $info[] = $this->helper('sales')->__('Buy %s for price %s', $qty, $price);
293
  }
298
  }
299
  }
300
 
301
+ /**
302
+ * Returns the HTML string for the tiered pricing
303
+ *
304
+ * @param Mage_Sales_Model_Quote_Item $item
305
+ * @return string
306
+ */
307
  public function getTierHtml($item)
308
  {
309
  $html = '';
310
  $prices = $item->getProduct()->getTierPrice();
311
  if ($prices) {
312
  foreach ($prices as $data) {
313
+ $qty = $data['price_qty'] * 1;
314
  $price = $this->convertPrice($data['price']);
315
  $info[] = $this->helper('sales')->__('%s for %s', $qty, $price);
316
  }
329
  {
330
  $optionStr = '';
331
  $this->_moveToCustomerStorage = true;
332
+ $optionIds = $item->getOptionByCode('option_ids');
333
+ if ($optionIds) {
334
  foreach (explode(',', $optionIds->getValue()) as $optionId) {
335
+ $option = $item->getProduct()->getOptionById($optionId);
336
+ if ($option) {
337
  $optionValue = $item->getOptionByCode('option_' . $option->getId())->getValue();
338
 
339
  $optionStr .= $option->getTitle() . ':';
361
  return $this->_moveToCustomerStorage;
362
  }
363
 
364
+ /**
365
+ * Returns the item's subtotal that includes tax
366
+ *
367
+ * @param Mage_Sales_Model_Quote_Item $item
368
+ * @return string
369
+ */
370
  public function displaySubtotalInclTax($item)
371
  {
372
  if ($item->getTaxBeforeDiscount()) {
377
  return $this->formatPrice($item->getRowTotal() + $tax);
378
  }
379
 
380
+ /**
381
+ * Returns the item's original price that includes tax
382
+ *
383
+ * @param Mage_Sales_Model_Quote_Item $item
384
+ * @return double
385
+ */
386
  public function displayOriginalPriceInclTax($item)
387
  {
388
  $tax = 0;
389
  if ($item->getTaxPercent()) {
390
  $tax = $item->getPrice() * ($item->getTaxPercent() / 100);
391
  }
392
+ return $this->convertPrice($item->getPrice() + ($tax / $item->getQty()));
393
  }
394
 
395
+ /**
396
+ * Returns the item's row total with any discount and also with any tax
397
+ *
398
+ * @param Mage_Sales_Model_Quote_Item $item
399
+ * @return string
400
+ */
401
  public function displayRowTotalWithDiscountInclTax($item)
402
  {
403
  $tax = ($item->getTaxAmount() ? $item->getTaxAmount() : 0);
404
  return $this->formatPrice($item->getRowTotal()-$item->getDiscountAmount()+$tax);
405
  }
406
 
407
+ /**
408
+ * Returns the text for the custom price (whether it includes or excludes tax)
409
+ *
410
+ * @return string
411
+ */
412
  public function getInclExclTaxMessage()
413
  {
414
  if (Mage::helper('tax')->priceIncludesTax($this->getStore())) {
418
  }
419
  }
420
 
421
+ /**
422
+ * Returns the store
423
+ *
424
+ * @return Mage_Core_Model_Store
425
+ */
426
  public function getStore()
427
  {
428
  return $this->getQuote()->getStore();
431
  /**
432
  * Return html button which calls configure window
433
  *
434
+ * @param Mage_Sales_Model_Quote_Item $item
435
  * @return string
436
  */
437
  public function getConfigureButtonHtml($item)
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Adjustments extends Mage_Adminhtml_Block_Template
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Adjustments extends Mage_Adminhtml_Block_Template
app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -45,19 +45,22 @@ class Mage_Adminhtml_Block_Sales_Order_Totals_Tax extends Mage_Tax_Block_Sales_O
45
 
46
  $taxClassAmount = array();
47
  if ($source instanceof Mage_Sales_Model_Order) {
48
- $taxClassAmount = Mage::helper('tax')->getCalculatedTaxes($source);
49
- if (empty($taxClassAmount)) {
50
- $rates = Mage::getModel('sales/order_tax')->getCollection()->loadByOrder($source)->toArray();
51
- $taxClassAmount = Mage::getSingleton('tax/calculation')->reproduceProcess($rates['items']);
52
- } else {
53
- $shippingTax = Mage::helper('tax')->getShippingTax($source);
54
- $taxClassAmount = array_merge($shippingTax, $taxClassAmount);
55
- }
56
  }
57
 
58
  return $taxClassAmount;
59
  }
60
 
 
 
 
 
 
 
 
 
 
 
61
  /**
62
  * Display tax amount
63
  *
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
45
 
46
  $taxClassAmount = array();
47
  if ($source instanceof Mage_Sales_Model_Order) {
48
+ $taxClassAmount = $this->_getTaxHelper()->getCalculatedTaxes($source);
 
 
 
 
 
 
 
49
  }
50
 
51
  return $taxClassAmount;
52
  }
53
 
54
+ /**
55
+ * Return Mage_Tax_Helper_Data instance
56
+ *
57
+ * @return Mage_Tax_Helper_Data
58
+ */
59
+ protected function _getTaxHelper()
60
+ {
61
+ return Mage::helper('tax');
62
+ }
63
+
64
  /**
65
  * Display tax amount
66
  *
app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php CHANGED