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
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
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/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/View/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/View/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/View/Tab/Creditmemos.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
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/Tab/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/Tab/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/View/Tab/Invoices.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
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/Tab/Shipments.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
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/Tab/Transactions.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
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/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/Sales/Reorder/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/Sales/Shipment.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
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/Shipment/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/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/Transactions.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
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/Transactions/Child/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/Transactions/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/Sales/Transactions/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/Sales/Transactions/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/Shipping/Carrier/Tablerate/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/Sitemap.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Sitemap/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/Sitemap/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/Sitemap/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/Sitemap/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/Sitemap/Grid/Renderer/Link.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -42,7 +42,9 @@ class Mage_Adminhtml_Block_Sitemap_Grid_Renderer_Link extends Mage_Adminhtml_Blo
42
  public function render(Varien_Object $row)
43
  {
44
  $fileName = preg_replace('/^\//', '', $row->getSitemapPath() . $row->getSitemapFilename());
45
- $url = $this->htmlEscape(Mage::app()->getStore($row->getStoreId())->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB) . $fileName);
 
 
46
 
47
  if (file_exists(BP . DS . $fileName)) {
48
  return sprintf('<a href="%1$s">%1$s</a>', $url);
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
42
  public function render(Varien_Object $row)
43
  {
44
  $fileName = preg_replace('/^\//', '', $row->getSitemapPath() . $row->getSitemapFilename());
45
+ $url = $this->escapeHtml(
46
+ Mage::app()->getStore($row->getStoreId())->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB) . $fileName
47
+ );
48
 
49
  if (file_exists(BP . DS . $fileName)) {
50
  return sprintf('<a href="%1$s">%1$s</a>', $url);
app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Store/Switcher.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/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/Store/Switcher/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
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Account/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/System/Account/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/System/Cache/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/System/Cache/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/System/Config/Dwstree.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/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/System/Config/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/System/Config/Form/Field.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -118,9 +118,11 @@ class Mage_Adminhtml_Block_System_Config_Form_Field
118
 
119
  // default value
120
  $html.= '<td class="use-default">';
121
- //$html.= '<input id="'.$id.'_inherit" name="'.$namePrefix.'[inherit]" type="checkbox" value="1" class="input-checkbox config-inherit" '.$inherit.' onclick="$(\''.$id.'\').disabled = this.checked">';
122
- $html.= '<input id="'.$id.'_inherit" name="'.$namePrefix.'[inherit]" type="checkbox" value="1" class="checkbox config-inherit" '.$inherit.' onclick="toggleValueElements(this, Element.previous(this.parentNode))" /> ';
123
- $html.= '<label for="'.$id.'_inherit" class="inherit" title="'.htmlspecialchars($defText).'">'.$checkboxLabel.'</label>';
 
 
124
  $html.= '</td>';
125
  }
126
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
118
 
119
  // default value
120
  $html.= '<td class="use-default">';
121
+ $html.= '<input id="' . $id . '_inherit" name="'
122
+ . $namePrefix . '[inherit]" type="checkbox" value="1" class="checkbox config-inherit" '
123
+ . $inherit . ' onclick="toggleValueElements(this, Element.previous(this.parentNode))" /> ';
124
+ $html.= '<label for="' . $id . '_inherit" class="inherit" title="'
125
+ . htmlspecialchars($defText) . '">' . $checkboxLabel . '</label>';
126
  $html.= '</td>';
127
  }
128
 
app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/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
 
@@ -31,7 +31,8 @@
31
  * @package Mage_Adminhtml
32
  * @author Magento Core Team <core@magentocommerce.com>
33
  */
34
- abstract class Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract extends Mage_Adminhtml_Block_System_Config_Form_Field
 
35
  {
36
  /**
37
  * Grid columns
@@ -145,7 +146,7 @@ abstract class Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract exte
145
  if ($element->getValue() && is_array($element->getValue())) {
146
  foreach ($element->getValue() as $rowId => $row) {
147
  foreach ($row as $key => $value) {
148
- $row[$key] = $this->htmlEscape($value);
149
  }
150
  $row['_id'] = $rowId;
151
  $result[$rowId] = new Varien_Object($row);
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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
  * @package Mage_Adminhtml
32
  * @author Magento Core Team <core@magentocommerce.com>
33
  */
34
+ abstract class Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract
35
+ extends Mage_Adminhtml_Block_System_Config_Form_Field
36
  {
37
  /**
38
  * Grid columns
146
  if ($element->getValue() && is_array($element->getValue())) {
147
  foreach ($element->getValue() as $rowId => $row) {
148
  foreach ($row as $key => $value) {
149
+ $row[$key] = $this->escapeHtml($value);
150
  }
151
  $row['_id'] = $rowId;
152
  $result[$rowId] = new Varien_Object($row);
app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/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/System/Config/Form/Field/Heading.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/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/System/Config/Form/Field/Import.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -32,12 +32,13 @@
32
  * @package Mage_Adminhtml
33
  * @author Magento Core Team <core@magentocommerce.com>
34
  */
35
- class Mage_Adminhtml_Block_System_Config_Form_Field_Select_Flatcatalog extends Mage_Adminhtml_Block_System_Config_Form_Field
 
36
  {
37
  protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
38
  {
39
- if (!Mage::helper('catalog/category_flat')->isRebuilt()) {
40
- $element->setDisabled('disabled')
41
  ->setValue(0);
42
  }
43
  return parent::_getElementHtml($element);
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
32
  * @package Mage_Adminhtml
33
  * @author Magento Core Team <core@magentocommerce.com>
34
  */
35
+ class Mage_Adminhtml_Block_System_Config_Form_Field_Select_Flatcatalog
36
+ extends Mage_Adminhtml_Block_System_Config_Form_Field
37
  {
38
  protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
39
  {
40
+ if (!Mage::helper('catalog/category_flat')->isBuilt()) {
41
+ $element->setDisabled(true)
42
  ->setValue(0);
43
  }
44
  return parent::_getElementHtml($element);
app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/Form/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/System/Config/Form/Fieldset/Modules/DisableOutput.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Config/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/System/Convert/Gui.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/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
 
@@ -58,7 +58,7 @@ class Mage_Adminhtml_Block_System_Convert_Gui_Edit extends Mage_Adminhtml_Block_
58
  public function getHeaderText()
59
  {
60
  if (Mage::registry('current_convert_profile')->getId()) {
61
- return $this->htmlEscape(Mage::registry('current_convert_profile')->getName());
62
  }
63
  else {
64
  return Mage::helper('adminhtml')->__('New Profile');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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
  public function getHeaderText()
59
  {
60
  if (Mage::registry('current_convert_profile')->getId()) {
61
+ return $this->escapeHtml(Mage::registry('current_convert_profile')->getName());
62
  }
63
  else {
64
  return Mage::helper('adminhtml')->__('New Profile');
app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/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/System/Convert/Gui/Edit/Tab/Upload.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/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
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -84,7 +84,7 @@ class Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_Wizard extends Mage_Admin
84
  }
85
 
86
  $value = $this->getData($key);
87
- return $this->htmlEscape(strlen($value) > 0 ? $value : $default);
88
  }
89
 
90
  public function getSelected($key, $value)
@@ -226,7 +226,9 @@ class Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_Wizard extends Mage_Admin
226
  public function getShortDateFormat()
227
  {
228
  if (!$this->_shortDateFormat) {
229
- $this->_shortDateFormat = Mage::app()->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
 
 
230
  }
231
  return $this->_shortDateFormat;
232
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
84
  }
85
 
86
  $value = $this->getData($key);
87
+ return $this->escapeHtml(strlen($value) > 0 ? $value : $default);
88
  }
89
 
90
  public function getSelected($key, $value)
226
  public function getShortDateFormat()
227
  {
228
  if (!$this->_shortDateFormat) {
229
+ $this->_shortDateFormat = Mage::app()->getLocale()->getDateStrFormat(
230
+ Mage_Core_Model_Locale::FORMAT_TYPE_SHORT
231
+ );
232
  }
233
  return $this->_shortDateFormat;
234
  }
app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/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/System/Convert/Gui/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/System/Convert/Profile.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/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
 
@@ -58,7 +58,7 @@ class Mage_Adminhtml_Block_System_Convert_Profile_Edit extends Mage_Adminhtml_Bl
58
  public function getHeaderText()
59
  {
60
  if (Mage::registry('current_convert_profile')->getId()) {
61
- return $this->htmlEscape(Mage::registry('current_convert_profile')->getName());
62
  }
63
  else {
64
  return Mage::helper('adminhtml')->__('New Profile');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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
  public function getHeaderText()
59
  {
60
  if (Mage::registry('current_convert_profile')->getId()) {
61
+ return $this->escapeHtml(Mage::registry('current_convert_profile')->getName());
62
  }
63
  else {
64
  return Mage::helper('adminhtml')->__('New Profile');
app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/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/System/Convert/Profile/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/System/Convert/Profile/Edit/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/System/Convert/Profile/Edit/Tab/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/System/Convert/Profile/Edit/Tab/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/System/Convert/Profile/Edit/Tab/Run.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/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/System/Convert/Profile/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/System/Convert/Profile/Run.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/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/System/Currency/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/System/Currency/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/System/Currency/Edit/Tab/Rates.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Currency/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/System/Currency/Rate/Matrix.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/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
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Design/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/System/Design/Edit/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
  class Mage_Adminhtml_Block_System_Design_Edit_Tab_General 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_System_Design_Edit_Tab_General extends Mage_Adminhtml_Block_Widget_Form
app/code/core/Mage/Adminhtml/Block/System/Design/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/System/Design/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/System/Email/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/System/Email/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/System/Email/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/System/Email/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/System/Email/Template/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/System/Email/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/System/Email/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/System/Email/Template/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/System/Email/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/System/Store/Delete.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -67,8 +67,7 @@ class Mage_Adminhtml_Block_System_Store_Delete extends Mage_Adminhtml_Block_Widg
67
  */
68
  public function getHeaderText()
69
  {
70
- return Mage::helper('adminhtml')->__("Delete %s '%s'", $this->getStoreTypeTitle(),
71
- $this->htmlEscape($this->getChild('form')->getDataObject()->getName()));
72
  }
73
 
74
  /**
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
67
  */
68
  public function getHeaderText()
69
  {
70
+ return Mage::helper('adminhtml')->__("Delete %s '%s'", $this->getStoreTypeTitle(), $this->escapeHtml($this->getChild('form')->getDataObject()->getName()));
 
71
  }
72
 
73
  /**
app/code/core/Mage/Adminhtml/Block/System/Store/Delete/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/System/Store/Delete/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/System/Store/Delete/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/System/Store/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/System/Store/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/System/Store/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/System/Store/Grid/Render/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/System/Store/Grid/Render/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/System/Store/Grid/Render/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/System/Store/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/System/Variable.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/System/Variable/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
 
@@ -98,7 +98,7 @@ class Mage_Adminhtml_Block_System_Variable_Edit extends Mage_Adminhtml_Block_Wid
98
  public function getHeaderText()
99
  {
100
  if ($this->getVariable()->getId()) {
101
- return Mage::helper('adminhtml')->__('Custom Variable "%s"', $this->htmlEscape($this->getVariable()->getName()));
102
  }
103
  else {
104
  return Mage::helper('adminhtml')->__('New Custom Variable');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
98
  public function getHeaderText()
99
  {
100
  if ($this->getVariable()->getId()) {
101
+ return Mage::helper('adminhtml')->__('Custom Variable "%s"', $this->escapeHtml($this->getVariable()->getName()));
102
  }
103
  else {
104
  return Mage::helper('adminhtml')->__('New Custom Variable');
app/code/core/Mage/Adminhtml/Block/System/Variable/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/System/Variable/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/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/Tag/Assigned/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/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
 
@@ -62,7 +62,7 @@ class Mage_Adminhtml_Block_Tag_Customer extends Mage_Adminhtml_Block_Widget_Grid
62
  $tagInfo = Mage::getModel('tag/tag')
63
  ->load(Mage::registry('tagId'));
64
 
65
- $this->_headerText = Mage::helper('tag')->__("Customers Tagged '%s'", $this->htmlEscape($tagInfo->getName()));
66
  }
67
 
68
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
62
  $tagInfo = Mage::getModel('tag/tag')
63
  ->load(Mage::registry('tagId'));
64
 
65
+ $this->_headerText = Mage::helper('tag')->__("Customers Tagged '%s'", $this->escapeHtml($tagInfo->getName()));
66
  }
67
 
68
  }
app/code/core/Mage/Adminhtml/Block/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/Tag/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
 
@@ -80,7 +80,7 @@ class Mage_Adminhtml_Block_Tag_Edit extends Mage_Adminhtml_Block_Widget_Form_Con
80
  public function getHeaderText()
81
  {
82
  if (Mage::registry('current_tag')->getId()) {
83
- return Mage::helper('tag')->__("Edit Tag '%s'", $this->htmlEscape(Mage::registry('current_tag')->getName()));
84
  }
85
  return Mage::helper('tag')->__('New Tag');
86
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
80
  public function getHeaderText()
81
  {
82
  if (Mage::registry('current_tag')->getId()) {
83
+ return Mage::helper('tag')->__("Edit Tag '%s'", $this->escapeHtml(Mage::registry('current_tag')->getName()));
84
  }
85
  return Mage::helper('tag')->__('New Tag');
86
  }
app/code/core/Mage/Adminhtml/Block/Tag/Edit/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/Tag/Edit/Assigned.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Tag/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/Tag/Grid/All.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Tag/Pending.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/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
 
@@ -60,7 +60,7 @@ class Mage_Adminhtml_Block_Tag_Product extends Mage_Adminhtml_Block_Widget_Grid_
60
  $tagInfo = Mage::getModel('tag/tag')
61
  ->load(Mage::registry('tagId'));
62
 
63
- $this->_headerText = Mage::helper('tag')->__("Products Tagged with '%s'", $this->htmlEscape($tagInfo->getName()));
64
  }
65
 
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
 
60
  $tagInfo = Mage::getModel('tag/tag')
61
  ->load(Mage::registry('tagId'));
62
 
63
+ $this->_headerText = Mage::helper('tag')->__("Products Tagged with '%s'", $this->escapeHtml($tagInfo->getName()));
64
  }
65
 
66
  }
app/code/core/Mage/Adminhtml/Block/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/Tag/Store/Switcher.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Tag/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/Tag/Tag/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
 
@@ -90,7 +90,7 @@ class Mage_Adminhtml_Block_Tag_Tag_Edit extends Mage_Adminhtml_Block_Widget_Form
90
  public function getHeaderText()
91
  {
92
  if (Mage::registry('tag_tag')->getId()) {
93
- return Mage::helper('tag')->__("Edit Tag '%s'", $this->htmlEscape(Mage::registry('tag_tag')->getName()));
94
  }
95
  else {
96
  return Mage::helper('tag')->__('New Tag');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
90
  public function getHeaderText()
91
  {
92
  if (Mage::registry('tag_tag')->getId()) {
93
+ return Mage::helper('tag')->__("Edit Tag '%s'", $this->escapeHtml(Mage::registry('tag_tag')->getName()));
94
  }
95
  else {
96
  return Mage::helper('tag')->__('New Tag');
app/code/core/Mage/Adminhtml/Block/Tag/Tag/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/Tag/Tag/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/Tax/Class.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Tax/Class/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_Tax_Class_Edit extends Mage_Adminhtml_Block_Widget_Fo
48
  public function getHeaderText()
49
  {
50
  if (Mage::registry('tax_class')->getId()) {
51
- return Mage::helper('tax')->__("Edit Class '%s'", $this->htmlEscape(Mage::registry('tax_class')->getClassName()));
52
  }
53
  else {
54
  return Mage::helper('tax')->__('New Class');
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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('tax_class')->getId()) {
51
+ return Mage::helper('tax')->__("Edit Class '%s'", $this->escapeHtml(Mage::registry('tax_class')->getClassName()));
52
  }
53
  else {
54
  return Mage::helper('tax')->__('New Class');
app/code/core/Mage/Adminhtml/Block/Tax/Class/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/Tax/Class/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/Tax/Rate/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/Tax/Rate/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_Tax_Rate_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_Tax_Rate_Grid extends Mage_Adminhtml_Block_Widget_Grid
app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/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/Tax/Rate/Grid/Renderer/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/Tax/Rate/ImportExport.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/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/Tax/Rate/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/Tax/Rate/Toolbar/Save.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Tax/Rule.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Tax/Rule/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/Tax/Rule/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
 
@@ -29,14 +29,12 @@
29
  *
30
  * @category Mage
31
  * @package Mage_Adminhtml
32
- * @author Magento Core Team <core@magentocommerce.com>
33
  */
34
-
35
  class Mage_Adminhtml_Block_Tax_Rule_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
36
  {
37
  /**
38
  * Init class
39
- *
40
  */
41
  public function __construct()
42
  {
@@ -73,9 +71,12 @@ class Mage_Adminhtml_Block_Tax_Rule_Edit_Form extends Mage_Adminhtml_Block_Widge
73
  ->setClassTypeFilter(Mage_Tax_Model_Class::TAX_CLASS_TYPE_CUSTOMER)
74
  ->toOptionArray();
75
 
 
 
 
76
  $rates = Mage::getModel('tax/calculation_rate')
77
  ->getCollection()
78
- ->toOptionArray();
79
 
80
  $fieldset->addField('code', 'text',
81
  array(
@@ -128,6 +129,15 @@ class Mage_Adminhtml_Block_Tax_Rule_Edit_Form extends Mage_Adminhtml_Block_Widge
128
  'note' => Mage::helper('tax')->__('Tax rates at the same priority are added, others are compounded.'),
129
  )
130
  );
 
 
 
 
 
 
 
 
 
131
  $fieldset->addField('position', 'text',
132
  array(
133
  'name' => 'position',
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Tax_Rule_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
35
  {
36
  /**
37
  * Init class
 
38
  */
39
  public function __construct()
40
  {
71
  ->setClassTypeFilter(Mage_Tax_Model_Class::TAX_CLASS_TYPE_CUSTOMER)
72
  ->toOptionArray();
73
 
74
+ /**
75
+ * Get rates array without memory leak
76
+ */
77
  $rates = Mage::getModel('tax/calculation_rate')
78
  ->getCollection()
79
+ ->getOptionRates();
80
 
81
  $fieldset->addField('code', 'text',
82
  array(
129
  'note' => Mage::helper('tax')->__('Tax rates at the same priority are added, others are compounded.'),
130
  )
131
  );
132
+
133
+ $fieldset->addField('calculate_subtotal', 'checkbox',
134
+ array(
135
+ 'name' => 'calculate_subtotal',
136
+ 'label' => Mage::helper('tax')->__('Calculate off subtotal only'),
137
+ 'onclick' => 'this.value = this.checked ? 1 : 0;',
138
+ 'checked' => $model->getCalculateSubtotal()
139
+ )
140
+ );
141
  $fieldset->addField('position', 'text',
142
  array(
143
  'name' => 'position',
app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php CHANGED
@@ -20,12 +20,14 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Grid
27
  {
28
-
 
 
29
  public function __construct()
30
  {
31
  parent::__construct();
@@ -35,6 +37,11 @@ class Mage_Adminhtml_Block_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Gri
35
  $this->setSaveParametersInSession(true);
36
  }
37
 
 
 
 
 
 
38
  protected function _prepareCollection()
39
  {
40
  $collection = Mage::getModel('tax/calculation_rule')
@@ -50,6 +57,12 @@ class Mage_Adminhtml_Block_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Gri
50
  return $this;
51
  }
52
 
 
 
 
 
 
 
53
  protected function _addColumnFilterToCollection($column)
54
  {
55
  if ($this->getCollection()) {
@@ -71,11 +84,16 @@ class Mage_Adminhtml_Block_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Gri
71
  return parent::_addColumnFilterToCollection($column);
72
  }
73
 
 
 
 
 
 
74
  protected function _prepareColumns()
75
  {
76
  $this->addColumn('code',
77
  array(
78
- 'header'=>Mage::helper('tax')->__('Name'),
79
  'align' =>'left',
80
  'index' => 'code',
81
  'filter_index' => 'code',
@@ -84,27 +102,29 @@ class Mage_Adminhtml_Block_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Gri
84
 
85
  $this->addColumn('customer_tax_classes',
86
  array(
87
- 'header'=>Mage::helper('tax')->__('Customer Tax Class'),
88
  'sortable' => false,
89
  'align' =>'left',
90
  'index' => 'customer_tax_classes',
91
  'filter_index' => 'ctc.customer_tax_class_id',
92
  'type' => 'options',
93
  'show_missing_option_values' => true,
94
- 'options' => Mage::getModel('tax/class')->getCollection()->setClassTypeFilter(Mage_Tax_Model_Class::TAX_CLASS_TYPE_CUSTOMER)->toOptionHash(),
 
95
  )
96
  );
97
 
98
  $this->addColumn('product_tax_classes',
99
  array(
100
- 'header'=>Mage::helper('tax')->__('Product Tax Class'),
101
  'sortable' => false,
102
  'align' =>'left',
103
  'index' => 'product_tax_classes',
104
  'filter_index' => 'ptc.product_tax_class_id',
105
  'type' => 'options',
106
  'show_missing_option_values' => true,
107
- 'options' => Mage::getModel('tax/class')->getCollection()->setClassTypeFilter(Mage_Tax_Model_Class::TAX_CLASS_TYPE_PRODUCT)->toOptionHash(),
 
108
  )
109
  );
110
 
@@ -123,15 +143,23 @@ class Mage_Adminhtml_Block_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Gri
123
 
124
  $this->addColumn('priority',
125
  array(
126
- 'header'=>Mage::helper('tax')->__('Priority'),
127
  'width' => '50px',
128
  'index' => 'priority'
129
  )
130
  );
131
 
 
 
 
 
 
 
 
 
132
  $this->addColumn('position',
133
  array(
134
- 'header'=>Mage::helper('tax')->__('Sort Order'),
135
  'width' => '50px',
136
  'index' => 'position'
137
  )
@@ -142,6 +170,12 @@ class Mage_Adminhtml_Block_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Gri
142
  return parent::_prepareColumns();
143
  }
144
 
 
 
 
 
 
 
145
  public function getRowUrl($row)
146
  {
147
  return $this->getUrl('*/*/edit', array('rule' => $row->getId()));
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Grid
27
  {
28
+ /**
29
+ * Set default value
30
+ */
31
  public function __construct()
32
  {
33
  parent::__construct();
37
  $this->setSaveParametersInSession(true);
38
  }
39
 
40
+ /**
41
+ * Prepare grid collection
42
+ *
43
+ * @return Mage_Adminhtml_Block_Tax_Rule_Grid
44
+ */
45
  protected function _prepareCollection()
46
  {
47
  $collection = Mage::getModel('tax/calculation_rule')
57
  return $this;
58
  }
59
 
60
+ /**
61
+ * Add filter
62
+ *
63
+ * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
64
+ * @return Mage_Adminhtml_Block_Widget_Grid
65
+ */
66
  protected function _addColumnFilterToCollection($column)
67
  {
68
  if ($this->getCollection()) {
84
  return parent::_addColumnFilterToCollection($column);
85
  }
86
 
87
+ /**
88
+ * Prepare grid columns
89
+ *
90
+ * @return Mage_Adminhtml_Block_Widget_Grid
91
+ */
92
  protected function _prepareColumns()
93
  {
94
  $this->addColumn('code',
95
  array(
96
+ 'header' => Mage::helper('tax')->__('Name'),
97
  'align' =>'left',
98
  'index' => 'code',
99
  'filter_index' => 'code',
102
 
103
  $this->addColumn('customer_tax_classes',
104
  array(
105
+ 'header' => Mage::helper('tax')->__('Customer Tax Class'),
106
  'sortable' => false,
107
  'align' =>'left',
108
  'index' => 'customer_tax_classes',
109
  'filter_index' => 'ctc.customer_tax_class_id',
110
  'type' => 'options',
111
  'show_missing_option_values' => true,
112
+ 'options' => Mage::getModel('tax/class')->getCollection()
113
+ ->setClassTypeFilter(Mage_Tax_Model_Class::TAX_CLASS_TYPE_CUSTOMER)->toOptionHash(),
114
  )
115
  );
116
 
117
  $this->addColumn('product_tax_classes',
118
  array(
119
+ 'header' => Mage::helper('tax')->__('Product Tax Class'),
120
  'sortable' => false,
121
  'align' =>'left',
122
  'index' => 'product_tax_classes',
123
  'filter_index' => 'ptc.product_tax_class_id',
124
  'type' => 'options',
125
  'show_missing_option_values' => true,
126
+ 'options' => Mage::getModel('tax/class')->getCollection()
127
+ ->setClassTypeFilter(Mage_Tax_Model_Class::TAX_CLASS_TYPE_PRODUCT)->toOptionHash(),
128
  )
129
  );
130
 
143
 
144
  $this->addColumn('priority',
145
  array(
146
+ 'header' => Mage::helper('tax')->__('Priority'),
147
  'width' => '50px',
148
  'index' => 'priority'
149
  )
150
  );
151
 
152
+ $this->addColumn('calculate_subtotal',
153
+ array(
154
+ 'header' => Mage::helper('tax')->__('Subtotal only'),
155
+ 'width' => '50px',
156
+ 'index' => 'calculate_subtotal'
157
+ )
158
+ );
159
+
160
  $this->addColumn('position',
161
  array(
162
+ 'header' => Mage::helper('tax')->__('Sort Order'),
163
  'width' => '50px',
164
  'index' => 'position'
165
  )
170
  return parent::_prepareColumns();
171
  }
172
 
173
+ /**
174
+ * Return url
175
+ *
176
+ * @param Mage_Core_Model_Abstract $row
177
+ * @return string
178
+ */
179
  public function getRowUrl($row)
180
  {
181
  return $this->getUrl('*/*/edit', array('rule' => $row->getId()));
app/code/core/Mage/Adminhtml/Block/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/Text/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/Urlrewrite.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Urlrewrite/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
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Urlrewrite/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/Urlrewrite/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/Urlrewrite/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/Urlrewrite/Link.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -42,7 +42,7 @@ class Mage_Adminhtml_Block_Urlrewrite_Link extends Mage_Core_Block_Abstract
42
  {
43
  if ($this->getItem()) {
44
  return '<p>' . $this->getLabel() . ' <a href="' . $this->getItemUrl() . '">'
45
- . $this->htmlEscape($this->getItem()->getName()) . '</a></p>';
46
  }
47
  }
48
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
42
  {
43
  if ($this->getItem()) {
44
  return '<p>' . $this->getLabel() . ' <a href="' . $this->getItemUrl() . '">'
45
+ . $this->escapeHtml($this->getItem()->getName()) . '</a></p>';
46
  }
47
  }
48
  }
app/code/core/Mage/Adminhtml/Block/Urlrewrite/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/Urlrewrite/Selector.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/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/Widget/Accordion/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/Widget/Breadcrumbs.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Button.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/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/Widget/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/Widget/Form/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/Widget/Form/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
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/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/Widget/Form/Renderer/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
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/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/Widget/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
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/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
 
@@ -496,7 +496,7 @@ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget
496
  /**
497
  * Prepare grid collection object
498
  *
499
- * @return this
500
  */
501
  protected function _prepareCollection()
502
  {
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
496
  /**
497
  * Prepare grid collection object
498
  *
499
+ * @return Mage_Adminhtml_Block_Widget_Grid
500
  */
501
  protected function _prepareCollection()
502
  {
app/code/core/Mage/Adminhtml/Block/Widget/Grid/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/Widget/Grid/Column.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/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/Widget/Grid/Column/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/Widget/Grid/Column/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/Widget/Grid/Column/Filter/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
 
@@ -32,7 +32,8 @@
32
  * @author Magento Core Team <core@magentocommerce.com>
33
  * @todo date format
34
  */
35
- class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract
 
36
  {
37
  protected $_locale;
38
 
@@ -48,17 +49,24 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date extends Mage_Adminhtml
48
  {
49
  $htmlId = $this->_getHtmlId() . microtime(true);
50
  $format = $this->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
51
- $html = '<div class="range"><div class="range-line date">
52
- <span class="label">' . Mage::helper('adminhtml')->__('From').':</span>
53
- <input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$htmlId.'_from" value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/>
54
- <img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle" id="'.$htmlId.'_from_trig" title="'.$this->htmlEscape(Mage::helper('adminhtml')->__('Date selector')).'"/>
55
- </div>';
56
- $html.= '<div class="range-line date">
57
- <span class="label">' . Mage::helper('adminhtml')->__('To').' :</span>
58
- <input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$htmlId.'_to" value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/>
59
- <img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle" id="'.$htmlId.'_to_trig" title="'.$this->htmlEscape(Mage::helper('adminhtml')->__('Date selector')).'"/>
60
- </div></div>';
61
- $html.= '<input type="hidden" name="'.$this->_getHtmlName().'[locale]" value="'.$this->getLocale()->getLocaleCode().'"/>';
 
 
 
 
 
 
 
62
  $html.= '<script type="text/javascript">
63
  Calendar.setup({
64
  inputField : "'.$htmlId.'_from",
@@ -91,7 +99,8 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date extends Mage_Adminhtml
91
 
92
  $(item).setStyle({
93
  "zIndex" : index + 1,
94
- "left" : offset[0] + scrollOffset[0] - dimensionsCalendar.width + dimensionsButton.width + "px",
 
95
  "top" : offset[1] + scrollOffset[1] + dimensionsButton.height + "px"
96
  });
97
  };
@@ -177,7 +186,9 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date extends Mage_Adminhtml
177
  $dateObj = $this->getLocale()->date(null, null, $locale, false);
178
 
179
  //set default timezone for store (admin)
180
- $dateObj->setTimezone(Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE));
 
 
181
 
182
  //set begining of day
183
  $dateObj->setHour(00);
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
32
  * @author Magento Core Team <core@magentocommerce.com>
33
  * @todo date format
34
  */
35
+ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date
36
+ extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract
37
  {
38
  protected $_locale;
39
 
49
  {
50
  $htmlId = $this->_getHtmlId() . microtime(true);
51
  $format = $this->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
52
+ $html = '<div class="range"><div class="range-line date">'
53
+ . '<span class="label">' . Mage::helper('adminhtml')->__('From').':</span>'
54
+ . '<input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$htmlId.'_from"'
55
+ . ' value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/>'
56
+ . '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
57
+ . ' id="'.$htmlId.'_from_trig"'
58
+ . ' title="' . $this->escapeHtml(Mage::helper('adminhtml')->__('Date selector')) . '"/>'
59
+ . '</div>';
60
+ $html.= '<div class="range-line date">'
61
+ . '<span class="label">' . Mage::helper('adminhtml')->__('To').' :</span>'
62
+ . '<input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$htmlId.'_to"'
63
+ . ' value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/>'
64
+ . '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
65
+ . ' id="'.$htmlId.'_to_trig"'
66
+ . ' title="'.$this->escapeHtml(Mage::helper('adminhtml')->__('Date selector')).'"/>'
67
+ . '</div></div>';
68
+ $html.= '<input type="hidden" name="'.$this->_getHtmlName().'[locale]"'
69
+ . 'value="'.$this->getLocale()->getLocaleCode().'"/>';
70
  $html.= '<script type="text/javascript">
71
  Calendar.setup({
72
  inputField : "'.$htmlId.'_from",
99
 
100
  $(item).setStyle({
101
  "zIndex" : index + 1,
102
+ "left" : offset[0] + scrollOffset[0] - dimensionsCalendar.width
103
+ + dimensionsButton.width + "px",
104
  "top" : offset[1] + scrollOffset[1] + dimensionsButton.height + "px"
105
  });
106
  };
186
  $dateObj = $this->getLocale()->date(null, null, $locale, false);
187
 
188
  //set default timezone for store (admin)
189
+ $dateObj->setTimezone(
190
+ Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE)
191
+ );
192
 
193
  //set begining of day
194
  $dateObj->setHour(00);
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -32,7 +32,8 @@
32
  * @author Magento Core Team <core@magentocommerce.com>
33
  * @todo date format
34
  */
35
- class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Datetime extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date
 
36
  {
37
  //full day is 86400, we need 23 hours:59 minutes:59 seconds = 86399
38
  const END_OF_DAY_IN_SECONDS = 86399;
@@ -76,7 +77,9 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Datetime extends Mage_Admin
76
  $dateObj = $this->getLocale()->date(null, null, $locale, false);
77
 
78
  //set default timezone for store (admin)
79
- $dateObj->setTimezone(Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE));
 
 
80
 
81
  //set date with applying timezone of store
82
  $dateObj->set(
@@ -112,17 +115,24 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Datetime extends Mage_Admin
112
  $format .= ' ' . $this->getLocale()->getTimeStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
113
  }
114
 
115
- $html = '<div class="range"><div class="range-line date">
116
- <span class="label">' . Mage::helper('adminhtml')->__('From').':</span>
117
- <input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$htmlId.'_from" value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/>
118
- <img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle" id="'.$htmlId.'_from_trig" title="'.$this->htmlEscape(Mage::helper('adminhtml')->__('Date selector')).'"/>
119
- </div>';
120
- $html.= '<div class="range-line date">
121
- <span class="label">' . Mage::helper('adminhtml')->__('To').' :</span>
122
- <input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$htmlId.'_to" value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/>
123
- <img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle" id="'.$htmlId.'_to_trig" title="'.$this->htmlEscape(Mage::helper('adminhtml')->__('Date selector')).'"/>
124
- </div></div>';
125
- $html.= '<input type="hidden" name="'.$this->_getHtmlName().'[locale]" value="'.$this->getLocale()->getLocaleCode().'"/>';
 
 
 
 
 
 
 
126
  $html.= '<script type="text/javascript">
127
  Calendar.setup({
128
  inputField : "'.$htmlId.'_from",
@@ -155,7 +165,9 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Datetime extends Mage_Admin
155
  if ($this->getColumn()->getFilterTime()) {
156
  $value = $this->getValue($index);
157
  if ($value instanceof Zend_Date) {
158
- return $value->toString($this->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT));
 
 
159
  }
160
  return $value;
161
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
32
  * @author Magento Core Team <core@magentocommerce.com>
33
  * @todo date format
34
  */
35
+ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Datetime
36
+ extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date
37
  {
38
  //full day is 86400, we need 23 hours:59 minutes:59 seconds = 86399
39
  const END_OF_DAY_IN_SECONDS = 86399;
77
  $dateObj = $this->getLocale()->date(null, null, $locale, false);
78
 
79
  //set default timezone for store (admin)
80
+ $dateObj->setTimezone(
81
+ Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE)
82
+ );
83
 
84
  //set date with applying timezone of store
85
  $dateObj->set(
115
  $format .= ' ' . $this->getLocale()->getTimeStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
116
  }
117
 
118
+ $html = '<div class="range"><div class="range-line date">'
119
+ . '<span class="label">' . Mage::helper('adminhtml')->__('From').':</span>'
120
+ . '<input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$htmlId.'_from"'
121
+ . ' value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/>'
122
+ . '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
123
+ . ' id="'.$htmlId.'_from_trig"'
124
+ . ' title="'.$this->escapeHtml(Mage::helper('adminhtml')->__('Date selector')).'"/>'
125
+ . '</div>';
126
+ $html.= '<div class="range-line date">'
127
+ . '<span class="label">' . Mage::helper('adminhtml')->__('To').' :</span>'
128
+ . '<input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$htmlId.'_to"'
129
+ . ' value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/>'
130
+ . '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
131
+ . ' id="'.$htmlId.'_to_trig"'
132
+ . ' title="'.$this->escapeHtml(Mage::helper('adminhtml')->__('Date selector')).'"/>'
133
+ . '</div></div>';
134
+ $html.= '<input type="hidden" name="'.$this->_getHtmlName().'[locale]"'
135
+ . ' value="'.$this->getLocale()->getLocaleCode().'"/>';
136
  $html.= '<script type="text/javascript">
137
  Calendar.setup({
138
  inputField : "'.$htmlId.'_from",
165
  if ($this->getColumn()->getFilterTime()) {
166
  $value = $this->getValue($index);
167
  if ($value instanceof Zend_Date) {
168
+ return $value->toString(
169
+ $this->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT)
170
+ );
171
  }
172
  return $value;
173
  }
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/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/Widget/Grid/Column/Filter/Radio.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/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/Widget/Grid/Column/Filter/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/Widget/Grid/Column/Filter/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/Widget/Grid/Column/Filter/Theme.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/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/Widget/Grid/Column/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/Widget/Grid/Column/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/Widget/Grid/Column/Renderer/Concat.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/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/Widget/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/Widget/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/Widget/Grid/Column/Renderer/Datetime.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/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/Widget/Grid/Column/Renderer/Longtext.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/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/Widget/Grid/Column/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/Widget/Grid/Column/Renderer/Radio.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/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/Widget/Grid/Column/Renderer/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/Widget/Grid/Column/Renderer/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/Widget/Grid/Column/Renderer/Theme.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/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/Widget/Grid/Massaction.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/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/Widget/Grid/Massaction/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/Widget/Grid/Massaction/Item/Additional/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/Widget/Grid/Massaction/Item/Additional/Interface.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/Grid/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/Widget/Tab/Interface.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Block/Widget/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/Widget/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/Widget/View/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/Controller/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/Controller/Report/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/Controller/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/Controller/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/Controller/Sales/Shipment.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Exception.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Helper/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/Helper/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/Helper/Catalog/Product/Composite.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Helper/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/Helper/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/Helper/Dashboard/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/Helper/Dashboard/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/Helper/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
 
@@ -120,6 +120,6 @@ class Mage_Adminhtml_Helper_Data extends Mage_Core_Helper_Abstract
120
  */
121
  public function decodeFilter(&$value)
122
  {
123
- $value = rawurldecode($value);
124
  }
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
 
120
  */
121
  public function decodeFilter(&$value)
122
  {
123
+ $value = trim(rawurldecode($value));
124
  }
125
  }
app/code/core/Mage/Adminhtml/Helper/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/Helper/Media/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/Helper/Rss.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Helper/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/Model/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/Model/Config/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
 
@@ -132,7 +132,7 @@ class Mage_Adminhtml_Model_Config_Data extends Varien_Object
132
  /**
133
  * Get field backend model
134
  */
135
- $backendClass = $fieldConfig->backend_model;
136
  if (!$backendClass) {
137
  $backendClass = 'core/config_data';
138
  }
@@ -335,7 +335,7 @@ class Mage_Adminhtml_Model_Config_Data extends Varien_Object
335
  if (is_null($configData)) {
336
  $configData = $this->_configData;
337
  }
338
- if (isset($configData[$path])) {
339
  $data = $configData[$path];
340
  $inherit = false;
341
  } else {
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
132
  /**
133
  * Get field backend model
134
  */
135
+ $backendClass = (isset($fieldConfig->backend_model))? $fieldConfig->backend_model : false;
136
  if (!$backendClass) {
137
  $backendClass = 'core/config_data';
138
  }
335
  if (is_null($configData)) {
336
  $configData = $this->_configData;
337
  }
338
+ if (array_key_exists($path, $configData)) {
339
  $data = $configData[$path];
340
  $inherit = false;
341
  } else {
app/code/core/Mage/Adminhtml/Model/Customer/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
 
@@ -92,7 +92,9 @@ class Mage_Adminhtml_Model_Customer_Renderer_Region implements Varien_Data_Form_
92
  . $element->serialize($htmlAttributes) .'>' . "\n";
93
  foreach ($regionCollection as $region) {
94
  $selected = ($regionId==$region['value']) ? ' selected="selected"' : '';
95
- $html.= '<option value="'.(int)$region['value'].'"'.$selected.'>'.$region['label'].'</option>';
 
 
96
  }
97
  $html.= '</select>' . "\n";
98
 
@@ -109,7 +111,8 @@ class Mage_Adminhtml_Model_Customer_Renderer_Region implements Varien_Data_Form_
109
  $element->setRequired(false);
110
  $html.= '<td class="value">';
111
  $html .= '<input id="' . $regionHtmlId . '" name="' . $regionHtmlName
112
- . '" value="' . $element->getEscapedValue() . '" ' . $element->serialize($htmlAttributes) . "/>" . "\n";
 
113
  $html .= '<input type="hidden" name="' . $regionIdHtmlName . '" id="' . $regionIdHtmlId . '" value=""/>';
114
  $html .= '</td>'."\n";
115
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
92
  . $element->serialize($htmlAttributes) .'>' . "\n";
93
  foreach ($regionCollection as $region) {
94
  $selected = ($regionId==$region['value']) ? ' selected="selected"' : '';
95
+ $html.= '<option value="' . (int)$region['value'] . '"' . $selected . '>'
96
+ . Mage::helper('adminhtml')->escapeHtml(Mage::helper('directory')->__($region['label']))
97
+ . '</option>';
98
  }
99
  $html.= '</select>' . "\n";
100
 
111
  $element->setRequired(false);
112
  $html.= '<td class="value">';
113
  $html .= '<input id="' . $regionHtmlId . '" name="' . $regionHtmlName
114
+ . '" value="' . $element->getEscapedValue() . '" '
115
+ . $element->serialize($htmlAttributes) . "/>" . "\n";
116
  $html .= '<input type="hidden" name="' . $regionIdHtmlName . '" id="' . $regionIdHtmlId . '" value=""/>';
117
  $html .= '</td>'."\n";
118
  }
app/code/core/Mage/Adminhtml/Model/Email/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/Model/Extension.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/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/Model/Observer.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/Report/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
  class Mage_Adminhtml_Model_Report_Item extends Varien_Object
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Model_Report_Item extends Varien_Object
app/code/core/Mage/Adminhtml/Model/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
 
@@ -71,8 +71,8 @@ class Mage_Adminhtml_Model_Sales_Order
71
  foreach ($order->getAllItems() as $item) {
72
  if (!$productCollection->getItemById($item->getProductId())) {
73
  $this->_getSession()->addError(
74
- Mage::helper('adminhtml')->__('The item %s (SKU %s) does not exist in the catalog anymore.', $item->getName(), $item->getSku()
75
- ));
76
  $hasBadItems = true;
77
  }
78
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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
  foreach ($order->getAllItems() as $item) {
72
  if (!$productCollection->getItemById($item->getProductId())) {
73
  $this->_getSession()->addError(
74
+ Mage::helper('adminhtml')->__('The item %s (SKU %s) does not exist in the catalog anymore.', $item->getName(), $item->getSku())
75
+ );
76
  $hasBadItems = true;
77
  }
78
  }
app/code/core/Mage/Adminhtml/Model/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
 
@@ -309,6 +309,13 @@ class Mage_Adminhtml_Model_Sales_Order_Create extends Varien_Object implements M
309
  }
310
  }
311
 
 
 
 
 
 
 
 
312
  $this->_initBillingAddressFromOrder($order);
313
  $this->_initShippingAddressFromOrder($order);
314
 
@@ -384,12 +391,15 @@ class Mage_Adminhtml_Model_Sales_Order_Create extends Varien_Object implements M
384
 
385
  protected function _initShippingAddressFromOrder(Mage_Sales_Model_Order $order)
386
  {
387
- $this->getQuote()->getShippingAddress()->setCustomerAddressId('');
 
 
 
388
  Mage::helper('core')->copyFieldset(
389
  'sales_copy_order_shipping_address',
390
  'to_order',
391
- $order->getShippingAddress(),
392
- $this->getQuote()->getShippingAddress()
393
  );
394
  }
395
 
@@ -622,7 +632,7 @@ class Mage_Adminhtml_Model_Sales_Order_Create extends Varien_Object implements M
622
  break;
623
  }
624
  if ($removeItem) {
625
- $this->getQuote()->removeItem($item->getId());
626
  }
627
  $this->setRecollect(true);
628
  }
@@ -855,8 +865,9 @@ class Mage_Adminhtml_Model_Sales_Order_Create extends Varien_Object implements M
855
  $item->getProduct()->setIsSuperMode(true);
856
  $item->getProduct()->unsSkipCheckRequiredOption();
857
  $item->checkData();
858
- } else {
859
- $this->moveQuoteItem($item->getId(), $info['action'], $itemQty);
 
860
  }
861
  }
862
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
309
  }
310
  }
311
 
312
+ $shippingAddress = $order->getShippingAddress();
313
+ if ($shippingAddress) {
314
+ $addressDiff = array_diff_assoc($shippingAddress->getData(), $order->getBillingAddress()->getData());
315
+ unset($addressDiff['address_type'], $addressDiff['entity_id']);
316
+ $shippingAddress->setSameAsBilling(empty($addressDiff));
317
+ }
318
+
319
  $this->_initBillingAddressFromOrder($order);
320
  $this->_initShippingAddressFromOrder($order);
321
 
391
 
392
  protected function _initShippingAddressFromOrder(Mage_Sales_Model_Order $order)
393
  {
394
+ $orderShippingAddress = $order->getShippingAddress();
395
+ $quoteShippingAddress = $this->getQuote()->getShippingAddress()
396
+ ->setCustomerAddressId('')
397
+ ->setSameAsBilling($orderShippingAddress && $orderShippingAddress->getSameAsBilling());
398
  Mage::helper('core')->copyFieldset(
399
  'sales_copy_order_shipping_address',
400
  'to_order',
401
+ $orderShippingAddress,
402
+ $quoteShippingAddress
403
  );
404
  }
405
 
632
  break;
633
  }
634
  if ($removeItem) {
635
+ $this->getQuote()->deleteItem($item);
636
  }
637
  $this->setRecollect(true);
638
  }
865
  $item->getProduct()->setIsSuperMode(true);
866
  $item->getProduct()->unsSkipCheckRequiredOption();
867
  $item->checkData();
868
+ }
869
+ if (!empty($info['action'])) {
870
+ $this->moveQuoteItem($item, $info['action'], $itemQty);
871
  }
872
  }
873
  }
app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/Search/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/Model/Search/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/Model/Search/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/Model/Session.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/Session/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/Model/System/Config/Backend/Admin/Custom.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custompath.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Observer.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/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/Model/System/Config/Backend/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/Model/System/Config/Backend/Catalog/Inventory/Managestock.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/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/Model/System/Config/Backend/Category.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cookie.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/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/Model/System/Config/Backend/Currency/Allow.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/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/Model/System/Config/Backend/Customer/Address/Street.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/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/Model/System/Config/Backend/Customer/Show/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/Model/System/Config/Backend/Datashare.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/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/Model/System/Config/Backend/Email/Logo.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/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
 
@@ -30,16 +30,25 @@
30
  *
31
  * @category Mage
32
  * @package Mage_Adminhtml
33
- * @author Magento Core Team <core@magentocommerce.com>
34
  */
35
  class Mage_Adminhtml_Model_System_Config_Backend_Email_Sender extends Mage_Core_Model_Config_Data
36
  {
 
 
 
 
 
37
  protected function _beforeSave()
38
  {
39
  $value = $this->getValue();
40
  if (!preg_match("/^[\S ]+$/", $value)) {
41
  Mage::throwException(Mage::helper('adminhtml')->__('Invalid sender name "%s". Please use only visible characters and spaces.', $value));
42
  }
 
 
 
 
43
  return $this;
44
  }
45
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
30
  *
31
  * @category Mage
32
  * @package Mage_Adminhtml
33
+ * @author Magento Core Team <core@magentocommerce.com>
34
  */
35
  class Mage_Adminhtml_Model_System_Config_Backend_Email_Sender extends Mage_Core_Model_Config_Data
36
  {
37
+ /**
38
+ * Check sender name validity
39
+ *
40
+ * @return Mage_Adminhtml_Model_System_Config_Backend_Email_Sender
41
+ */
42
  protected function _beforeSave()
43
  {
44
  $value = $this->getValue();
45
  if (!preg_match("/^[\S ]+$/", $value)) {
46
  Mage::throwException(Mage::helper('adminhtml')->__('Invalid sender name "%s". Please use only visible characters and spaces.', $value));
47
  }
48
+
49
+ if (strlen($value) > 255) {
50
+ Mage::throwException(Mage::helper('adminhtml')->__('Maximum sender name length is 255. Please correct your settings.'));
51
+ }
52
  return $this;
53
  }
54
  }
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/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/Model/System/Config/Backend/Filename.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/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/Model/System/Config/Backend/Image/Favicon.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Secure.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/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/Model/System/Config/Backend/Serialized.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/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/Model/System/Config/Backend/Translate.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/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/Model/System/Config/Source/Admin/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/Model/System/Config/Source/Allregion.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/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/Model/System/Config/Source/Catalog/TimeFormat.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Checktype.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/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
  class Mage_Adminhtml_Model_System_Config_Source_Cms_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
  class Mage_Adminhtml_Model_System_Config_Source_Cms_Page
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/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/Model/System/Config/Source/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/Model/System/Config/Source/Country/Full.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/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/Model/System/Config/Source/Currency/Service.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/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/Model/System/Config/Source/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/Model/System/Config/Source/Customer/Group/Multiselect.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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_Model_System_Config_Source_Package
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Model_System_Config_Source_Package
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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_Model_System_Config_Source_Dev_Dbautoup
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Model_System_Config_Source_Dev_Dbautoup
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/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/Model/System/Config/Source/Email/Smtpauth.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/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/Model/System/Config/Source/Enabledisable.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/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/Model/System/Config/Source/Locale/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/Model/System/Config/Source/Locale/Currency/All.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php ADDED
@@ -0,0 +1,38 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magentocommerce.com for more information.
20
+ *
21
+ * @category Mage
22
+ * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+
27
+ /**
28
+ * Locale weekdays source
29
+ *
30
+ * @author Magento Core Team <core@magentocommerce.com>
31
+ */
32
+ class Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes
33
+ {
34
+ public function toOptionArray()
35
+ {
36
+ return Mage::app()->getLocale()->getOptionWeekdays(true, true);
37
+ }
38
+ }
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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_Model_System_Config_Source_Nooptreq
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Model_System_Config_Source_Nooptreq
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/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/Model/System/Config/Source/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/Model/System/Config/Source/Order/Status/Newprocessing.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/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/Model/System/Config/Source/Product/Options/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/Model/System/Config/Source/Product/Thumbnail.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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_Model_System_Config_Source_Shipping_Taxclass
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Model_System_Config_Source_Shipping_Taxclass
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/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/Model/System/Config/Source/Tax/Apply/On.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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_Model_System_Config_Source_Tax_Apply_On
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Model_System_Config_Source_Tax_Apply_On
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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_Model_System_Config_Source_Tax_Basedon
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Model_System_Config_Source_Tax_Basedon
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/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
  class Mage_Adminhtml_Model_System_Config_Source_Tax_Catalog
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Model_System_Config_Source_Tax_Catalog
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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_Model_System_Config_Source_Web_Protocol
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Model_System_Config_Source_Web_Protocol
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Redirect.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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_Model_System_Config_Source_Web_Redirect
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Model_System_Config_Source_Web_Redirect
app/code/core/Mage/Adminhtml/Model/System/Config/Source/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/Model/System/Config/Source/Yesno.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/Model/System/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/Model/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
  class Mage_Adminhtml_Model_Url extends Mage_Core_Model_Url
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Model_Url extends Mage_Core_Model_Url
app/code/core/Mage/Adminhtml/controllers/AjaxController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Api/UserController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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_Api_UserController extends Mage_Adminhtml_Controller_Action
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Api_UserController extends Mage_Adminhtml_Controller_Action
app/code/core/Mage/Adminhtml/controllers/CacheController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -284,6 +284,15 @@ class Mage_Adminhtml_Catalog_CategoryController extends Mage_Adminhtml_Controlle
284
  $category->setPath($parentCategory->getPath());
285
  }
286
 
 
 
 
 
 
 
 
 
 
287
  /**
288
  * Process "Use Config Settings" checkboxes
289
  */
@@ -335,15 +344,6 @@ class Mage_Adminhtml_Catalog_CategoryController extends Mage_Adminhtml_Controlle
335
  }
336
  }
337
 
338
- /**
339
- * Check "Use Default Value" checkboxes values
340
- */
341
- if ($useDefaults = $this->getRequest()->getPost('use_default')) {
342
- foreach ($useDefaults as $attributeCode) {
343
- $category->setData($attributeCode, false);
344
- }
345
- }
346
-
347
  /**
348
  * Unset $_POST['use_config'] before save
349
  */
@@ -383,7 +383,7 @@ class Mage_Adminhtml_Catalog_CategoryController extends Mage_Adminhtml_Controlle
383
  * Category id after which we have put our category
384
  */
385
  $prevNodeId = $this->getRequest()->getPost('aid', false);
386
-
387
  try {
388
  $category->move($parentNodeId, $prevNodeId);
389
  $this->getResponse()->setBody("SUCCESS");
@@ -392,7 +392,7 @@ class Mage_Adminhtml_Catalog_CategoryController extends Mage_Adminhtml_Controlle
392
  $this->getResponse()->setBody($e->getMessage());
393
  }
394
  catch (Exception $e){
395
- $this->getResponse()->setBody(Mage::helper('catalog')->__('Category move error'.$e));
396
  Mage::logException($e);
397
  }
398
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
284
  $category->setPath($parentCategory->getPath());
285
  }
286
 
287
+ /**
288
+ * Check "Use Default Value" checkboxes values
289
+ */
290
+ if ($useDefaults = $this->getRequest()->getPost('use_default')) {
291
+ foreach ($useDefaults as $attributeCode) {
292
+ $category->setData($attributeCode, false);
293
+ }
294
+ }
295
+
296
  /**
297
  * Process "Use Config Settings" checkboxes
298
  */
344
  }
345
  }
346
 
 
 
 
 
 
 
 
 
 
347
  /**
348
  * Unset $_POST['use_config'] before save
349
  */
383
  * Category id after which we have put our category
384
  */
385
  $prevNodeId = $this->getRequest()->getPost('aid', false);
386
+ $category->setData('save_rewrites_history', Mage::helper('catalog')->shouldSaveUrlRewritesHistory());
387
  try {
388
  $category->move($parentNodeId, $prevNodeId);
389
  $this->getResponse()->setBody("SUCCESS");
392
  $this->getResponse()->setBody($e->getMessage());
393
  }
394
  catch (Exception $e){
395
+ $this->getResponse()->setBody(Mage::helper('catalog')->__('Category move error %s', $e));
396
  Mage::logException($e);
397
  }
398
 
app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -166,9 +166,10 @@ class Mage_Adminhtml_Catalog_Product_Action_AttributeController extends Mage_Adm
166
  'products' => $productIds
167
  ));
168
 
169
- $this->_getSession()->addNotice(
170
- $this->__('Please refresh "Catalog URL Rewrites" and "Product Attributes" in System -> <a href="%s">Index Management</a>', $this->getUrl('adminhtml/process/list'))
171
- );
 
172
  }
173
 
174
  $this->_getSession()->addSuccess(
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
166
  'products' => $productIds
167
  ));
168
 
169
+ $notice = Mage::getConfig()->getNode('adminhtml/messages/website_chnaged_indexers/label');
170
+ if ($notice) {
171
+ $this->_getSession()->addNotice($this->__((string)$notice, $this->getUrl('adminhtml/process/list')));
172
+ }
173
  }
174
 
175
  $this->_getSession()->addSuccess(
app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -510,8 +510,17 @@ class Mage_Adminhtml_Catalog_ProductController extends Mage_Adminhtml_Controller
510
  }
511
  }
512
  $productData = $this->_filterDates($productData, $dateFields);
513
-
514
  $product->addData($productData);
 
 
 
 
 
 
 
 
 
 
515
  $product->validate();
516
  /**
517
  * @todo implement full validation process with errors returning which are ignoring now
@@ -668,8 +677,13 @@ class Mage_Adminhtml_Catalog_ProductController extends Mage_Adminhtml_Controller
668
  * Filter product stock data
669
  *
670
  * @param array $stockData
 
671
  */
672
- protected function _filterStockData(&$stockData) {
 
 
 
 
673
  if (!isset($stockData['use_config_manage_stock'])) {
674
  $stockData['use_config_manage_stock'] = 0;
675
  }
@@ -727,8 +741,6 @@ class Mage_Adminhtml_Catalog_ProductController extends Mage_Adminhtml_Controller
727
  }
728
  }
729
 
730
- Mage::getModel('catalogrule/rule')->applyAllRulesToProduct($productId);
731
-
732
  $this->_getSession()->addSuccess($this->__('The product has been saved.'));
733
  } catch (Mage_Core_Exception $e) {
734
  $this->_getSession()->addError($e->getMessage())
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
510
  }
511
  }
512
  $productData = $this->_filterDates($productData, $dateFields);
 
513
  $product->addData($productData);
514
+
515
+ /* set restrictions for date ranges */
516
+ $resource = $product->getResource();
517
+ $resource->getAttribute('special_from_date')
518
+ ->setMaxValue($product->getSpecialToDate());
519
+ $resource->getAttribute('news_from_date')
520
+ ->setMaxValue($product->getNewsToDate());
521
+ $resource->getAttribute('custom_design_from')
522
+ ->setMaxValue($product->getCustomDesignTo());
523
+
524
  $product->validate();
525
  /**
526
  * @todo implement full validation process with errors returning which are ignoring now
677
  * Filter product stock data
678
  *
679
  * @param array $stockData
680
+ * @return null
681
  */
682
+ protected function _filterStockData(&$stockData)
683
+ {
684
+ if (is_null($stockData)) {
685
+ return;
686
+ }
687
  if (!isset($stockData['use_config_manage_stock'])) {
688
  $stockData['use_config_manage_stock'] = 0;
689
  }
741
  }
742
  }
743
 
 
 
744
  $this->_getSession()->addSuccess($this->__('The product has been saved.'));
745
  } catch (Mage_Core_Exception $e) {
746
  $this->_getSession()->addError($e->getMessage())
app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/CatalogController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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_Customer_OnlineController extends Mage_Adminhtml_Controller_Action
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Customer_OnlineController extends Mage_Adminhtml_Controller_Action
app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/CustomerController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -290,7 +290,9 @@ class Mage_Adminhtml_CustomerController extends Mage_Adminhtml_Controller_Action
290
  }
291
  }
292
 
293
- if (Mage::getSingleton('admin/session')->isAllowed('customer/newsletter')) {
 
 
294
  $customer->setIsSubscribed(isset($data['subscription']));
295
  }
296
 
@@ -511,10 +513,10 @@ class Mage_Adminhtml_CustomerController extends Mage_Adminhtml_Controller_Action
511
  public function viewCartAction()
512
  {
513
  $this->_initCustomer();
514
- $layout = $this->loadLayout()
515
  ->getLayout()
516
  ->getBlock('admin.customer.view.cart')
517
- ->setWebsiteId();
518
  $this->renderLayout();
519
  }
520
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
290
  }
291
  }
292
 
293
+ if (Mage::getSingleton('admin/session')->isAllowed('customer/newsletter')
294
+ && !$customer->getConfirmation()
295
+ ) {
296
  $customer->setIsSubscribed(isset($data['subscription']));
297
  }
298
 
513
  public function viewCartAction()
514
  {
515
  $this->_initCustomer();
516
+ $this->loadLayout()
517
  ->getLayout()
518
  ->getBlock('admin.customer.view.cart')
519
+ ->setWebsiteId($this->getRequest()->getParam('website_id'));
520
  $this->renderLayout();
521
  }
522
 
app/code/core/Mage/Adminhtml/controllers/DashboardController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/IndexController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/JsonController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  /**
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  /**
app/code/core/Mage/Adminhtml/controllers/NotificationController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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_Permissions_UserController extends Mage_Adminhtml_Controller_Action
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Permissions_UserController extends Mage_Adminhtml_Controller_Action
app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/PollController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -303,6 +303,7 @@ class Mage_Adminhtml_Promo_CatalogController extends Mage_Adminhtml_Controller_A
303
  $this->_getSession()->addError($errorMessage . ' ' . $e->getMessage());
304
  } catch (Exception $e) {
305
  $this->_getSession()->addError($errorMessage);
 
306
  }
307
  $this->_redirect('*/*');
308
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
303
  $this->_getSession()->addError($errorMessage . ' ' . $e->getMessage());
304
  } catch (Exception $e) {
305
  $this->_getSession()->addError($errorMessage);
306
+ Mage::logException($e);
307
  }
308
  $this->_redirect('*/*');
309
  }
app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/PromoController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/RatingController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Report/TagController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/ReportController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -242,9 +242,6 @@ class Mage_Adminhtml_Sales_Order_CreateController extends Mage_Adminhtml_Control
242
  $this->_getOrderCreateModel()->moveQuoteItem($moveItemId, $moveTo);
243
  }
244
 
245
- /*if ($paymentData = $this->getRequest()->getPost('payment')) {
246
- $this->_getOrderCreateModel()->setPaymentData($paymentData);
247
- }*/
248
  if ($paymentData = $this->getRequest()->getPost('payment')) {
249
  $this->_getOrderCreateModel()->getQuote()->getPayment()->addData($paymentData);
250
  }
@@ -342,7 +339,6 @@ class Mage_Adminhtml_Sales_Order_CreateController extends Mage_Adminhtml_Control
342
 
343
  public function reorderAction()
344
  {
345
- // $this->_initSession();
346
  $this->_getSession()->clear();
347
  $orderId = $this->getRequest()->getParam('order_id');
348
  $order = Mage::getModel('sales/order')->load($orderId);
@@ -481,7 +477,13 @@ class Mage_Adminhtml_Sales_Order_CreateController extends Mage_Adminhtml_Control
481
  {
482
  try {
483
  $this->_processActionData('save');
484
- if ($paymentData = $this->getRequest()->getPost('payment')) {
 
 
 
 
 
 
485
  $this->_getOrderCreateModel()->setPaymentData($paymentData);
486
  $this->_getOrderCreateModel()->getQuote()->getPayment()->addData($paymentData);
487
  }
@@ -493,7 +495,11 @@ class Mage_Adminhtml_Sales_Order_CreateController extends Mage_Adminhtml_Control
493
 
494
  $this->_getSession()->clear();
495
  Mage::getSingleton('adminhtml/session')->addSuccess($this->__('The order has been created.'));
496
- $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
 
 
 
 
497
  } catch (Mage_Payment_Model_Info_Exception $e) {
498
  $this->_getOrderCreateModel()->saveQuote();
499
  $message = $e->getMessage();
@@ -524,6 +530,7 @@ class Mage_Adminhtml_Sales_Order_CreateController extends Mage_Adminhtml_Control
524
  $action = strtolower($this->getRequest()->getActionName());
525
  switch ($action) {
526
  case 'index':
 
527
  $aclResource = 'sales/order/actions/create';
528
  break;
529
  case 'reorder':
@@ -532,9 +539,6 @@ class Mage_Adminhtml_Sales_Order_CreateController extends Mage_Adminhtml_Control
532
  case 'cancel':
533
  $aclResource = 'sales/order/actions/cancel';
534
  break;
535
- case 'save':
536
- $aclResource = 'sales/order/actions/edit';
537
- break;
538
  default:
539
  $aclResource = 'sales/order/actions';
540
  break;
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
242
  $this->_getOrderCreateModel()->moveQuoteItem($moveItemId, $moveTo);
243
  }
244
 
 
 
 
245
  if ($paymentData = $this->getRequest()->getPost('payment')) {
246
  $this->_getOrderCreateModel()->getQuote()->getPayment()->addData($paymentData);
247
  }
339
 
340
  public function reorderAction()
341
  {
 
342
  $this->_getSession()->clear();
343
  $orderId = $this->getRequest()->getParam('order_id');
344
  $order = Mage::getModel('sales/order')->load($orderId);
477
  {
478
  try {
479
  $this->_processActionData('save');
480
+ $paymentData = $this->getRequest()->getPost('payment');
481
+ if ($paymentData) {
482
+ $paymentData['checks'] = Mage_Payment_Model_Method_Abstract::CHECK_USE_INTERNAL
483
+ | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_COUNTRY
484
+ | Mage_Payment_Model_Method_Abstract::CHECK_USE_FOR_CURRENCY
485
+ | Mage_Payment_Model_Method_Abstract::CHECK_ORDER_TOTAL_MIN_MAX
486
+ | Mage_Payment_Model_Method_Abstract::CHECK_ZERO_TOTAL;
487
  $this->_getOrderCreateModel()->setPaymentData($paymentData);
488
  $this->_getOrderCreateModel()->getQuote()->getPayment()->addData($paymentData);
489
  }
495
 
496
  $this->_getSession()->clear();
497
  Mage::getSingleton('adminhtml/session')->addSuccess($this->__('The order has been created.'));
498
+ if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view')) {
499
+ $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
500
+ } else {
501
+ $this->_redirect('*/sales_order/index');
502
+ }
503
  } catch (Mage_Payment_Model_Info_Exception $e) {
504
  $this->_getOrderCreateModel()->saveQuote();
505
  $message = $e->getMessage();
530
  $action = strtolower($this->getRequest()->getActionName());
531
  switch ($action) {
532
  case 'index':
533
+ case 'save':
534
  $aclResource = 'sales/order/actions/create';
535
  break;
536
  case 'reorder':
539
  case 'cancel':
540
  $aclResource = 'sales/order/actions/cancel';
541
  break;
 
 
 
542
  default:
543
  $aclResource = 'sales/order/actions';
544
  break;
app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -671,14 +671,15 @@ class Mage_Adminhtml_Sales_Order_ShipmentController extends Mage_Adminhtml_Contr
671
  $outputPdf = $this->_combineLabelsPdf($labelsContent);
672
  $this->_prepareDownloadResponse('ShippingLabels.pdf', $outputPdf->render(), 'application/pdf');
673
  return;
674
- } else {
675
- $createdFromPartErrorMsg = $createdFromOrders ? 'orders' : 'shipments';
676
- $this->_getSession()
677
- ->addError(Mage::helper('sales')->__('There are no shipping labels related to selected %s.', $createdFromPartErrorMsg));
678
  }
 
679
  if ($createdFromOrders) {
 
 
680
  $this->_redirect('*/sales_order/index');
681
  } else {
 
 
682
  $this->_redirect('*/sales_order_shipment/index');
683
  }
684
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
671
  $outputPdf = $this->_combineLabelsPdf($labelsContent);
672
  $this->_prepareDownloadResponse('ShippingLabels.pdf', $outputPdf->render(), 'application/pdf');
673
  return;
 
 
 
 
674
  }
675
+
676
  if ($createdFromOrders) {
677
+ $this->_getSession()
678
+ ->addError(Mage::helper('sales')->__('There are no shipping labels related to selected orders.'));
679
  $this->_redirect('*/sales_order/index');
680
  } else {
681
+ $this->_getSession()
682
+ ->addError(Mage::helper('sales')->__('There are no shipping labels related to selected shipments.'));
683
  $this->_redirect('*/sales_order_shipment/index');
684
  }
685
  }
app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -383,17 +383,18 @@ class Mage_Adminhtml_Sales_OrderController extends Mage_Adminhtml_Controller_Act
383
  {
384
  $orderIds = $this->getRequest()->getPost('order_ids', array());
385
  $countHoldOrder = 0;
386
- $countNonHoldOrder = 0;
387
  foreach ($orderIds as $orderId) {
388
  $order = Mage::getModel('sales/order')->load($orderId);
389
  if ($order->canHold()) {
390
  $order->hold()
391
  ->save();
392
  $countHoldOrder++;
393
- } else {
394
- $countNonHoldOrder++;
395
  }
396
  }
 
 
 
397
  if ($countNonHoldOrder) {
398
  if ($countHoldOrder) {
399
  $this->_getSession()->addError($this->__('%s order(s) were not put on hold.', $countNonHoldOrder));
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
383
  {
384
  $orderIds = $this->getRequest()->getPost('order_ids', array());
385
  $countHoldOrder = 0;
386
+
387
  foreach ($orderIds as $orderId) {
388
  $order = Mage::getModel('sales/order')->load($orderId);
389
  if ($order->canHold()) {
390
  $order->hold()
391
  ->save();
392
  $countHoldOrder++;
 
 
393
  }
394
  }
395
+
396
+ $countNonHoldOrder = count($orderIds) - $countHoldOrder;
397
+
398
  if ($countNonHoldOrder) {
399
  if ($countHoldOrder) {
400
  $this->_getSession()->addError($this->__('%s order(s) were not put on hold.', $countNonHoldOrder));
app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/SalesController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/SitemapController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/SurveyController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/System/AccountController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/System/BackupController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/System/CacheController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/System/DesignController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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,9 @@
33
  */
34
  class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Controller_Action
35
  {
 
 
 
36
  public function indexAction()
37
  {
38
  $this->_title($this->__('System'))->_title($this->__('Transactional Emails'));
@@ -44,21 +47,27 @@ class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Cont
44
 
45
  $this->loadLayout();
46
  $this->_setActiveMenu('system/email_template');
47
- $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Transactional Emails'), Mage::helper('adminhtml')->__('Transactional Emails'));
 
 
 
48
 
49
  $this->_addContent($this->getLayout()->createBlock('adminhtml/system_email_template', 'template'));
50
  $this->renderLayout();
51
  }
52
 
 
 
 
53
  public function gridAction()
54
  {
55
- $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/system_email_template_grid')->toHtml());
 
 
56
  }
57
 
58
-
59
  /**
60
  * New transactional email action
61
- *
62
  */
63
  public function newAction()
64
  {
@@ -66,29 +75,43 @@ class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Cont
66
  }
67
 
68
  /**
69
- * Edit transactioanl email action
70
- *
71
  */
72
  public function editAction()
73
  {
74
  $this->loadLayout();
75
  $template = $this->_initTemplate('id');
76
  $this->_setActiveMenu('system/email_template');
77
- $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Transactional Emails'), Mage::helper('adminhtml')->__('Transactional Emails'), $this->getUrl('*/*'));
 
 
 
 
78
 
79
  if ($this->getRequest()->getParam('id')) {
80
- $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Edit Template'), Mage::helper('adminhtml')->__('Edit System Template'));
 
 
 
81
  } else {
82
- $this->_addBreadcrumb(Mage::helper('adminhtml')->__('New Template'), Mage::helper('adminhtml')->__('New System Template'));
 
 
 
83
  }
84
 
85
  $this->_title($template->getId() ? $template->getTemplateCode() : $this->__('New Template'));
86
-
87
- $this->_addContent($this->getLayout()->createBlock('adminhtml/system_email_template_edit', 'template_edit')
88
- ->setEditMode((bool)$this->getRequest()->getParam('id')));
 
 
89
  $this->renderLayout();
90
  }
91
 
 
 
 
92
  public function saveAction()
93
  {
94
  $request = $this->getRequest();
@@ -96,7 +119,9 @@ class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Cont
96
 
97
  $template = $this->_initTemplate('id');
98
  if (!$template->getId() && $id) {
99
- Mage::getSingleton('adminhtml/session')->addError(Mage::helper('adminhtml')->__('This Email template no longer exists.'));
 
 
100
  $this->_redirect('*/*/');
101
  return;
102
  }
@@ -104,10 +129,6 @@ class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Cont
104
  try {
105
  $template->setTemplateSubject($request->getParam('template_subject'))
106
  ->setTemplateCode($request->getParam('template_code'))
107
- /*
108
- ->setTemplateSenderEmail($request->getParam('sender_email'))
109
- ->setTemplateSenderName($request->getParam('sender_name'))
110
- */
111
  ->setTemplateText($request->getParam('template_text'))
112
  ->setTemplateStyles($request->getParam('template_styles'))
113
  ->setModifiedAt(Mage::getSingleton('core/date')->gmtDate())
@@ -115,38 +136,44 @@ class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Cont
115
  ->setOrigTemplateVariables($request->getParam('orig_template_variables'));
116
 
117
  if (!$template->getId()) {
118
- //$type = constant(Mage::getConfig()->getModelClassName('core/email_template') . "::TYPE_HTML");
119
  $template->setTemplateType(Mage_Core_Model_Email_Template::TYPE_HTML);
120
  }
121
 
122
- if($request->getParam('_change_type_flag')) {
123
- //$type = constant(Mage::getConfig()->getModelClassName('core/email_template') . "::TYPE_TEXT");
124
  $template->setTemplateType(Mage_Core_Model_Email_Template::TYPE_TEXT);
125
  $template->setTemplateStyles('');
126
  }
127
 
128
  $template->save();
129
  Mage::getSingleton('adminhtml/session')->setFormData(false);
130
- Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('adminhtml')->__('The email template has been saved.'));
 
 
131
  $this->_redirect('*/*');
132
  }
133
  catch (Exception $e) {
134
- Mage::getSingleton('adminhtml/session')->setData('email_template_form_data', $this->getRequest()->getParams());
 
 
 
135
  Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
136
  $this->_forward('new');
137
  }
138
-
139
  }
140
 
141
- public function deleteAction() {
142
-
 
 
 
143
  $template = $this->_initTemplate('id');
144
- if($template->getId()) {
145
  try {
146
  $template->delete();
147
- // display success message
148
- Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('adminhtml')->__('The email template has been deleted.'));
149
- // go to grid
150
  $this->_redirect('*/*/');
151
  return;
152
  }
@@ -154,21 +181,23 @@ class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Cont
154
  $this->_getSession()->addError($e->getMessage());
155
  }
156
  catch (Exception $e) {
157
- $this->_getSession()->addError(Mage::helper('adminhtml')->__('An error occurred while deleting email template data. Please review log and try again.'));
 
 
158
  Mage::logException($e);
159
- // save data in session
160
- Mage::getSingleton('adminhtml/session')->setFormData($data);
161
- // redirect to edit form
162
- $this->_redirect('*/*/edit', array('id' => $id));
163
  return;
164
  }
165
  }
166
- // display error message
167
- Mage::getSingleton('adminhtml/session')->addError(Mage::helper('adminhtml')->__('Unable to find a Email Template to delete.'));
168
- // go to grid
169
  $this->_redirect('*/*/');
170
  }
171
 
 
 
 
172
  public function previewAction()
173
  {
174
  $this->loadLayout('systemPreview');
@@ -177,7 +206,6 @@ class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Cont
177
 
178
  /**
179
  * Set template data to retrieve it in template info form
180
- *
181
  */
182
  public function defaultTemplateAction()
183
  {
@@ -198,7 +226,7 @@ class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Cont
198
  * Load email template from request
199
  *
200
  * @param string $idFieldName
201
- * @return Mage_Adminhtml_Model_Email_Template $model
202
  */
203
  protected function _initTemplate($idFieldName = 'template_id')
204
  {
@@ -218,6 +246,11 @@ class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Cont
218
  return $model;
219
  }
220
 
 
 
 
 
 
221
  protected function _isAllowed()
222
  {
223
  return Mage::getSingleton('admin/session')->isAllowed('system/email_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
 
33
  */
34
  class Mage_Adminhtml_System_Email_TemplateController extends Mage_Adminhtml_Controller_Action
35
  {
36
+ /**
37
+ * Index action
38
+ */
39
  public function indexAction()
40
  {
41
  $this->_title($this->__('System'))->_title($this->__('Transactional Emails'));
47
 
48
  $this->loadLayout();
49
  $this->_setActiveMenu('system/email_template');
50
+ $this->_addBreadcrumb(
51
+ Mage::helper('adminhtml')->__('Transactional Emails'),
52
+ Mage::helper('adminhtml')->__('Transactional Emails')
53
+ );
54
 
55
  $this->_addContent($this->getLayout()->createBlock('adminhtml/system_email_template', 'template'));
56
  $this->renderLayout();
57
  }
58
 
59
+ /**
60
+ * Grid action
61
+ */
62
  public function gridAction()
63
  {
64
+ $this->getResponse()->setBody(
65
+ $this->getLayout()->createBlock('adminhtml/system_email_template_grid')->toHtml()
66
+ );
67
  }
68
 
 
69
  /**
70
  * New transactional email action
 
71
  */
72
  public function newAction()
73
  {
75
  }
76
 
77
  /**
78
+ * Edit transactional email action
 
79
  */
80
  public function editAction()
81
  {
82
  $this->loadLayout();
83
  $template = $this->_initTemplate('id');
84
  $this->_setActiveMenu('system/email_template');
85
+ $this->_addBreadcrumb(
86
+ Mage::helper('adminhtml')->__('Transactional Emails'),
87
+ Mage::helper('adminhtml')->__('Transactional Emails'),
88
+ $this->getUrl('*/*')
89
+ );
90
 
91
  if ($this->getRequest()->getParam('id')) {
92
+ $this->_addBreadcrumb(
93
+ Mage::helper('adminhtml')->__('Edit Template'),
94
+ Mage::helper('adminhtml')->__('Edit System Template')
95
+ );
96
  } else {
97
+ $this->_addBreadcrumb(
98
+ Mage::helper('adminhtml')->__('New Template'),
99
+ Mage::helper('adminhtml')->__('New System Template')
100
+ );
101
  }
102
 
103
  $this->_title($template->getId() ? $template->getTemplateCode() : $this->__('New Template'));
104
+ $this->_addContent(
105
+ $this->getLayout()->createBlock('adminhtml/system_email_template_edit', 'template_edit')->setEditMode(
106
+ (bool)$this->getRequest()->getParam('id')
107
+ )
108
+ );
109
  $this->renderLayout();
110
  }
111
 
112
+ /**
113
+ * Save action
114
+ */
115
  public function saveAction()
116
  {
117
  $request = $this->getRequest();
119
 
120
  $template = $this->_initTemplate('id');
121
  if (!$template->getId() && $id) {
122
+ Mage::getSingleton('adminhtml/session')->addError(
123
+ Mage::helper('adminhtml')->__('This Email template no longer exists.')
124
+ );
125
  $this->_redirect('*/*/');
126
  return;
127
  }
129
  try {
130
  $template->setTemplateSubject($request->getParam('template_subject'))
131
  ->setTemplateCode($request->getParam('template_code'))
 
 
 
 
132
  ->setTemplateText($request->getParam('template_text'))
133
  ->setTemplateStyles($request->getParam('template_styles'))
134
  ->setModifiedAt(Mage::getSingleton('core/date')->gmtDate())
136
  ->setOrigTemplateVariables($request->getParam('orig_template_variables'));
137
 
138
  if (!$template->getId()) {
139
+ $template->setAddedAt(Mage::getSingleton('core/date')->gmtDate());
140
  $template->setTemplateType(Mage_Core_Model_Email_Template::TYPE_HTML);
141
  }
142
 
143
+ if ($request->getParam('_change_type_flag')) {
 
144
  $template->setTemplateType(Mage_Core_Model_Email_Template::TYPE_TEXT);
145
  $template->setTemplateStyles('');
146
  }
147
 
148
  $template->save();
149
  Mage::getSingleton('adminhtml/session')->setFormData(false);
150
+ Mage::getSingleton('adminhtml/session')->addSuccess(
151
+ Mage::helper('adminhtml')->__('The email template has been saved.')
152
+ );
153
  $this->_redirect('*/*');
154
  }
155
  catch (Exception $e) {
156
+ Mage::getSingleton('adminhtml/session')->setData(
157
+ 'email_template_form_data',
158
+ $this->getRequest()->getParams()
159
+ );
160
  Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
161
  $this->_forward('new');
162
  }
 
163
  }
164
 
165
+ /**
166
+ * Delete action
167
+ */
168
+ public function deleteAction()
169
+ {
170
  $template = $this->_initTemplate('id');
171
+ if ($template->getId()) {
172
  try {
173
  $template->delete();
174
+ Mage::getSingleton('adminhtml/session')->addSuccess(
175
+ Mage::helper('adminhtml')->__('The email template has been deleted.')
176
+ );
177
  $this->_redirect('*/*/');
178
  return;
179
  }
181
  $this->_getSession()->addError($e->getMessage());
182
  }
183
  catch (Exception $e) {
184
+ $this->_getSession()->addError(
185
+ Mage::helper('adminhtml')->__('An error occurred while deleting email template data. Please review log and try again.')
186
+ );
187
  Mage::logException($e);
188
+ $this->_redirect('*/*/edit', array('id' => $template));
 
 
 
189
  return;
190
  }
191
  }
192
+ Mage::getSingleton('adminhtml/session')->addError(
193
+ Mage::helper('adminhtml')->__('Unable to find a Email Template to delete.')
194
+ );
195
  $this->_redirect('*/*/');
196
  }
197
 
198
+ /**
199
+ * Preview action
200
+ */
201
  public function previewAction()
202
  {
203
  $this->loadLayout('systemPreview');
206
 
207
  /**
208
  * Set template data to retrieve it in template info form
 
209
  */
210
  public function defaultTemplateAction()
211
  {
226
  * Load email template from request
227
  *
228
  * @param string $idFieldName
229
+ * @return Mage_Adminhtml_Model_Email_Template
230
  */
231
  protected function _initTemplate($idFieldName = 'template_id')
232
  {
246
  return $model;
247
  }
248
 
249
+ /**
250
+ * Check permissions
251
+ *
252
+ * @return bool
253
+ */
254
  protected function _isAllowed()
255
  {
256
  return Mage::getSingleton('admin/session')->isAllowed('system/email_template');
app/code/core/Mage/Adminhtml/controllers/System/StoreController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/System/VariableController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/SystemController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/TagController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -172,8 +172,7 @@ class Mage_Adminhtml_TagController extends Mage_Adminhtml_Controller_Action
172
  $productIds = Mage::helper('adminhtml/js')->decodeGridSerializedInput(
173
  $postData['tag_assigned_products']
174
  );
175
- $tagRelationModel = Mage::getModel('tag/tag_relation');
176
- $tagRelationModel->addRelations($model, $productIds);
177
  }
178
 
179
  try {
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
172
  $productIds = Mage::helper('adminhtml/js')->decodeGridSerializedInput(
173
  $postData['tag_assigned_products']
174
  );
175
+ $model->setData('tag_assigned_products', $productIds);
 
176
  }
177
 
178
  try {
app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -61,8 +61,7 @@ class Mage_Adminhtml_Tax_RateController extends Mage_Adminhtml_Controller_Action
61
  */
62
  public function addAction()
63
  {
64
- $rateModel = Mage::getSingleton('tax/calculation_rate')
65
- ->load(null);
66
 
67
  $this->_title($this->__('Sales'))
68
  ->_title($this->__('Tax'))
@@ -70,9 +69,12 @@ class Mage_Adminhtml_Tax_RateController extends Mage_Adminhtml_Controller_Action
70
 
71
  $this->_title($this->__('New Rate'));
72
 
73
- //This line substitutes in the form the previously entered by the user values, if any of them were wrong.
74
  $rateModel->setData(Mage::getSingleton('adminhtml/session')->getFormData(true));
75
 
 
 
 
 
76
  $this->_initAction()
77
  ->_addBreadcrumb(Mage::helper('tax')->__('Manage Tax Rates'), Mage::helper('tax')->__('Manage Tax Rates'), $this->getUrl('*/tax_rate'))
78
  ->_addBreadcrumb(Mage::helper('tax')->__('New Tax Rate'), Mage::helper('tax')->__('New Tax Rate'))
@@ -133,10 +135,19 @@ class Mage_Adminhtml_Tax_RateController extends Mage_Adminhtml_Controller_Action
133
  ->_title($this->__('Manage Tax Zones and Rates'));
134
 
135
  $rateId = (int)$this->getRequest()->getParam('rate');
136
- $rateModel = Mage::getSingleton('tax/calculation_rate')->load($rateId);
 
 
 
 
 
137
  if (!$rateModel->getId()) {
138
  $this->getResponse()->setRedirect($this->getUrl("*/*/"));
139
- return ;
 
 
 
 
140
  }
141
 
142
  $this->_title(sprintf("%s", $rateModel->getCode()));
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
61
  */
62
  public function addAction()
63
  {
64
+ $rateModel = Mage::getSingleton('tax/calculation_rate')->load(null);
 
65
 
66
  $this->_title($this->__('Sales'))
67
  ->_title($this->__('Tax'))
69
 
70
  $this->_title($this->__('New Rate'));
71
 
 
72
  $rateModel->setData(Mage::getSingleton('adminhtml/session')->getFormData(true));
73
 
74
+ if ($rateModel->getZipIsRange() && !$rateModel->hasTaxPostcode()) {
75
+ $rateModel->setTaxPostcode($rateModel->getZipFrom() . '-' . $rateModel->getZipTo());
76
+ }
77
+
78
  $this->_initAction()
79
  ->_addBreadcrumb(Mage::helper('tax')->__('Manage Tax Rates'), Mage::helper('tax')->__('Manage Tax Rates'), $this->getUrl('*/tax_rate'))
80
  ->_addBreadcrumb(Mage::helper('tax')->__('New Tax Rate'), Mage::helper('tax')->__('New Tax Rate'))
135
  ->_title($this->__('Manage Tax Zones and Rates'));
136
 
137
  $rateId = (int)$this->getRequest()->getParam('rate');
138
+ $rateModel = Mage::getSingleton('tax/calculation_rate')->load(null);
139
+ $rateModel->setData(Mage::getSingleton('adminhtml/session')->getFormData(true));
140
+ if ($rateModel->getId() != $rateId) {
141
+ $rateModel->load($rateId);
142
+ }
143
+
144
  if (!$rateModel->getId()) {
145
  $this->getResponse()->setRedirect($this->getUrl("*/*/"));
146
+ return;
147
+ }
148
+
149
+ if ($rateModel->getZipIsRange() && !$rateModel->hasTaxPostcode()) {
150
+ $rateModel->setTaxPostcode($rateModel->getZipFrom() . '-' . $rateModel->getZipTo());
151
  }
152
 
153
  $this->_title(sprintf("%s", $rateModel->getCode()));
app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 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,11 @@
33
  */
34
  class Mage_Adminhtml_Tax_RuleController extends Mage_Adminhtml_Controller_Action
35
  {
 
 
 
 
 
36
  public function indexAction()
37
  {
38
  $this->_title($this->__('Sales'))
@@ -45,11 +50,17 @@ class Mage_Adminhtml_Tax_RuleController extends Mage_Adminhtml_Controller_Action
45
  return $this;
46
  }
47
 
 
 
 
48
  public function newAction()
49
  {
50
  $this->_forward('edit');
51
  }
52
 
 
 
 
53
  public function editAction()
54
  {
55
  $this->_title($this->__('Sales'))
@@ -62,7 +73,8 @@ class Mage_Adminhtml_Tax_RuleController extends Mage_Adminhtml_Controller_Action
62
  $ruleModel->load($taxRuleId);
63
  if (!$ruleModel->getId()) {
64
  Mage::getSingleton('adminhtml/session')->unsRuleData();
65
- Mage::getSingleton('adminhtml/session')->addError(Mage::helper('tax')->__('This rule no longer exists.'));
 
66
  $this->_redirect('*/*/');
67
  return;
68
  }
@@ -78,45 +90,57 @@ class Mage_Adminhtml_Tax_RuleController extends Mage_Adminhtml_Controller_Action
78
  Mage::register('tax_rule', $ruleModel);
79
 
80
  $this->_initAction()
81
- ->_addBreadcrumb($taxRuleId ? Mage::helper('tax')->__('Edit Rule') : Mage::helper('tax')->__('New Rule'), $taxRuleId ? Mage::helper('tax')->__('Edit Rule') : Mage::helper('tax')->__('New Rule'))
82
- ->_addContent($this->getLayout()->createBlock('adminhtml/tax_rule_edit')->setData('action', $this->getUrl('*/tax_rule/save')))
 
 
 
83
  ->renderLayout();
84
  }
85
 
 
 
 
 
 
86
  public function saveAction()
87
  {
88
- if ($postData = $this->getRequest()->getPost()) {
89
-
90
- $ruleModel = Mage::getSingleton('tax/calculation_rule');
91
- $ruleModel->setData($postData);
92
 
93
- try {
94
- $ruleModel->save();
 
95
 
96
- Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('tax')->__('The tax rule has been saved.'));
 
97
 
98
- if ($this->getRequest()->getParam('back')) {
99
- $this->_redirect('*/*/edit', array('rule' => $ruleModel->getId()));
100
- return;
101
- }
102
 
103
- $this->_redirect('*/*/');
104
- return;
105
- }
106
- catch (Mage_Core_Exception $e) {
107
- Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
108
- }
109
- catch (Exception $e) {
110
- Mage::getSingleton('adminhtml/session')->addError(Mage::helper('tax')->__('An error occurred while saving this tax rule.'));
111
  }
112
 
113
- Mage::getSingleton('adminhtml/session')->setRuleData($postData);
114
- $this->_redirectReferer();
115
- return;
116
  }
117
- $this->getResponse()->setRedirect($this->getUrl('*/tax_rule'));
 
 
 
 
 
 
 
 
 
118
  }
119
 
 
 
 
120
  public function deleteAction()
121
  {
122
  $ruleId = (int)$this->getRequest()->getParam('rule');
@@ -131,7 +155,8 @@ class Mage_Adminhtml_Tax_RuleController extends Mage_Adminhtml_Controller_Action
131
  try {
132
  $ruleModel->delete();
133
 
134
- Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('tax')->__('The tax rule has been deleted.'));
 
135
  $this->_redirect('*/*/');
136
 
137
  return;
@@ -140,7 +165,8 @@ class Mage_Adminhtml_Tax_RuleController extends Mage_Adminhtml_Controller_Action
140
  Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
141
  }
142
  catch (Exception $e) {
143
- Mage::getSingleton('adminhtml/session')->addError(Mage::helper('tax')->__('An error occurred while deleting this tax rule.'));
 
144
  }
145
 
146
  $this->_redirectReferer();
@@ -161,8 +187,36 @@ class Mage_Adminhtml_Tax_RuleController extends Mage_Adminhtml_Controller_Action
161
  return $this;
162
  }
163
 
 
 
 
 
 
164
  protected function _isAllowed()
165
  {
166
  return Mage::getSingleton('admin/session')->isAllowed('sales/tax/rules');
167
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
168
  }
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 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_Tax_RuleController extends Mage_Adminhtml_Controller_Action
35
  {
36
+ /**
37
+ * Index action
38
+ *
39
+ * @return Mage_Adminhtml_Tax_RuleController
40
+ */
41
  public function indexAction()
42
  {
43
  $this->_title($this->__('Sales'))
50
  return $this;
51
  }
52
 
53
+ /**
54
+ * Redirect to edit action
55
+ */
56
  public function newAction()
57
  {
58
  $this->_forward('edit');
59
  }
60
 
61
+ /**
62
+ * Edit action
63
+ */
64
  public function editAction()
65
  {
66
  $this->_title($this->__('Sales'))
73
  $ruleModel->load($taxRuleId);
74
  if (!$ruleModel->getId()) {
75
  Mage::getSingleton('adminhtml/session')->unsRuleData();
76
+ Mage::getSingleton('adminhtml/session')
77
+ ->addError(Mage::helper('tax')->__('This rule no longer exists.'));
78
  $this->_redirect('*/*/');
79
  return;
80
  }
90
  Mage::register('tax_rule', $ruleModel);
91
 
92
  $this->_initAction()
93
+ ->_addBreadcrumb(
94
+ $taxRuleId ? Mage::helper('tax')->__('Edit Rule') : Mage::helper('tax')->__('New Rule'),
95
+ $taxRuleId ? Mage::helper('tax')->__('Edit Rule') : Mage::helper('tax')->__('New Rule'))
96
+ ->_addContent($this->getLayout()->createBlock('adminhtml/tax_rule_edit')
97
+ ->setData('action', $this->getUrl('*/tax_rule/save')))
98
  ->renderLayout();
99
  }
100
 
101
+ /**
102
+ * Save action
103
+ *
104
+ * @return Mage_Core_Controller_Response_Http|Mage_Core_Controller_Varien_Action
105
+ */
106
  public function saveAction()
107
  {
108
+ $postData = $this->getRequest()->getPost();
109
+ if (!$postData) {
110
+ return $this->getResponse()->setRedirect($this->getUrl('*/tax_rule'));
111
+ }
112
 
113
+ $ruleModel = $this->_getSingletonModel('tax/calculation_rule');
114
+ $ruleModel->setData($postData);
115
+ $ruleModel->setCalculateSubtotal($this->getRequest()->getParam('calculate_subtotal', 0));
116
 
117
+ try {
118
+ $ruleModel->save();
119
 
120
+ $this->_getSingletonModel('adminhtml/session')
121
+ ->addSuccess($this->_getHelperModel('tax')->__('The tax rule has been saved.'));
 
 
122
 
123
+ if ($this->getRequest()->getParam('back')) {
124
+ return $this->_redirect('*/*/edit', array('rule' => $ruleModel->getId()));
 
 
 
 
 
 
125
  }
126
 
127
+ return $this->_redirect('*/*/');
 
 
128
  }
129
+ catch (Mage_Core_Exception $e) {
130
+ $this->_getSingletonModel('adminhtml/session')->addError($e->getMessage());
131
+ }
132
+ catch (Exception $e) {
133
+ $this->_getSingletonModel('adminhtml/session')
134
+ ->addError($this->_getHelperModel('tax')->__('An error occurred while saving this tax rule.'));
135
+ }
136
+
137
+ $this->_getSingletonModel('adminhtml/session')->setRuleData($postData);
138
+ $this->_redirectReferer();
139
  }
140
 
141
+ /**
142
+ * Delete action
143
+ */
144
  public function deleteAction()
145
  {
146
  $ruleId = (int)$this->getRequest()->getParam('rule');
155
  try {
156
  $ruleModel->delete();
157
 
158
+ Mage::getSingleton('adminhtml/session')
159
+ ->addSuccess(Mage::helper('tax')->__('The tax rule has been deleted.'));
160
  $this->_redirect('*/*/');
161
 
162
  return;
165
  Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
166
  }
167
  catch (Exception $e) {
168
+ Mage::getSingleton('adminhtml/session')
169
+ ->addError(Mage::helper('tax')->__('An error occurred while deleting this tax rule.'));
170
  }
171
 
172
  $this->_redirectReferer();
187
  return $this;
188
  }
189
 
190
+ /**
191
+ * Check if sales rules is allowed
192
+ *
193
+ * @return bool
194
+ */
195
  protected function _isAllowed()
196
  {
197
  return Mage::getSingleton('admin/session')->isAllowed('sales/tax/rules');
198
  }
199
+
200
+ /**
201
+ * Return model instance
202
+ *
203
+ * @param string $className
204
+ * @param array $arguments
205
+ * @return Mage_Core_Model_Abstract
206
+ */
207
+ protected function _getSingletonModel($className, $arguments = array())
208
+ {
209
+ return Mage::getSingleton($className, $arguments);
210
+ }
211
+
212
+ /**
213
+ * Return helper instance
214
+ *
215
+ * @param string $className
216
+ * @return Mage_Core_Model_Abstract
217
+ */
218
+ protected function _getHelperModel($className)
219
+ {
220
+ return Mage::helper($className);
221
+ }
222
  }
app/code/core/Mage/Adminhtml/controllers/TaxController.php ADDED
@@ -0,0 +1,53 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magentocommerce.com for more information.
20
+ *
21
+ * @category Mage
22
+ * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+
27
+ /**
28
+ * Product tax admin controller
29
+ *
30
+ * @category Mage
31
+ * @package Mage_Adminhtml
32
+ * @author Magento Core Team <core@magentocommerce.com>
33
+ */
34
+ class Mage_Adminhtml_TaxController extends Mage_Adminhtml_Controller_Action
35
+ {
36
+ /**
37
+ * Set tax ignore notification flag and redirect back
38
+ */
39
+ public function ignoreTaxNotificationAction()
40
+ {
41
+ $section = $this->getRequest()->getParam('section');
42
+ if ($section) {
43
+ try {
44
+ $path = 'tax/ignore_notification/' . $section;
45
+ Mage::getModel('core/config')->saveConfig($path, 1);
46
+ Mage::getConfig()->reinit();
47
+ } catch (Exception $e) {
48
+ Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
49
+ }
50
+ }
51
+ $this->_redirectReferer();
52
+ }
53
+ }
app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
@@ -43,7 +43,7 @@ class Mage_Adminhtml_UrlrewriteController extends Mage_Adminhtml_Controller_Acti
43
  $this->_title($this->__('Rewrite Rules'));
44
 
45
  // initialize urlrewrite, product and category models
46
- Mage::register('current_urlrewrite', Mage::getModel('core/url_rewrite')
47
  ->load($this->getRequest()->getParam('id', 0))
48
  );
49
  $productId = $this->getRequest()->getParam('product', 0);
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
43
  $this->_title($this->__('Rewrite Rules'));
44
 
45
  // initialize urlrewrite, product and category models
46
+ Mage::register('current_urlrewrite', Mage::getSingleton('core/factory')->getUrlRewriteInstance()
47
  ->load($this->getRequest()->getParam('id', 0))
48
  );
49
  $productId = $this->getRequest()->getParam('product', 0);
app/code/core/Mage/Adminhtml/etc/adminhtml.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category Mage
23
  * @package Mage_Adminhtml
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category Mage
23
  * @package Mage_Adminhtml
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/code/core/Mage/Adminhtml/etc/config.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category Mage
23
  * @package Mage_Adminhtml
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
@@ -171,6 +171,11 @@
171
  </create>
172
  </order>
173
  </sales>
 
 
 
 
 
174
  </adminhtml>
175
  <default>
176
  <system>
21
  *
22
  * @category Mage
23
  * @package Mage_Adminhtml
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
171
  </create>
172
  </order>
173
  </sales>
174
+ <messages>
175
+ <website_chnaged_indexers translate="label" module="catalog">
176
+ <label><![CDATA[Please refresh "Catalog URL Rewrites" and "Product Attributes" in System -&gt; <a href="%s">Index Management</a>]]></label>
177
+ </website_chnaged_indexers>
178
+ </messages>
179
  </adminhtml>
180
  <default>
181
  <system>
app/code/core/Mage/Adminhtml/etc/jstranslator.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category Mage
23
  * @package Mage_Adminhtml
24
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category Mage
23
  * @package Mage_Adminhtml
24
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/locale/en_US/Mage_Adminhtml.csv CHANGED
@@ -201,6 +201,7 @@
201
  "Catalog Price Rules","Catalog Price Rules"
202
  "Catalog Rewrites","Catalog Rewrites"
203
  "Categories","Categories"
 
204
  "Category:","Category:"
205
  "Chart is disabled. If you want to enable chart, click <a href=""%s"">here</a>.","Chart is disabled. If you want to enable chart, click <a href=""%s"">here</a>."
206
  "Checkbox","Checkbox"
@@ -351,6 +352,7 @@
351
  "FTP Login","FTP Login"
352
  "FTP Password","FTP Password"
353
  "FTP credentials","FTP credentials"
 
354
  "Failed to add a product to cart by id ""%s"".","Failed to add a product to cart by id ""%s""."
355
  "Failed to cancel the billing agreement.","Failed to cancel the billing agreement."
356
  "Failed to clear the JavaScript/CSS cache.","Failed to clear the JavaScript/CSS cache."
@@ -411,6 +413,7 @@
411
  "IPN (Instant Payment Notification) Only","IPN (Instant Payment Notification) Only"
412
  "If there is an account associated with %s you will receive an email with a link to reset your password.","If there is an account associated with %s you will receive an email with a link to reset your password."
413
  "If this message persists, please contact the store owner.","If this message persists, please contact the store owner."
 
414
  "Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
415
  "Images Cache","Images Cache"
416
  "Import","Import"
@@ -457,6 +460,7 @@
457
  "Invoice voiding error.","Invoice voiding error."
458
  "Invoices","Invoices"
459
  "Is Closed","Is Closed"
 
460
  "Issue Number","Issue Number"
461
  "Items","Items"
462
  "JavaScript seems to be disabled in your browser.","JavaScript seems to be disabled in your browser."
@@ -518,12 +522,15 @@
518
  "Manage Content","Manage Content"
519
  "Manage Currency Rates","Manage Currency Rates"
520
  "Manage Customers","Manage Customers"
 
521
  "Manage Ratings","Manage Ratings"
522
  "Manage Stores","Manage Stores"
523
  "Manage Tax Rules","Manage Tax Rules"
524
  "Manage Tax Zones and Rates","Manage Tax Zones and Rates"
 
525
  "Manual","Manual"
526
  "Matched Expression","Matched Expression"
 
527
  "Mb","Mb"
528
  "Media (.avi, .flv, .swf)","Media (.avi, .flv, .swf)"
529
  "Media storages synchronization has completed!","Media storages synchronization has completed!"
@@ -622,6 +629,7 @@
622
  "Only mapped fields","Only mapped fields"
623
  "Optional","Optional"
624
  "Options","Options"
 
625
  "Order","Order"
626
  "Order #%s","Order #%s"
627
  "Order #%s (%s)","Order #%s (%s)"
@@ -715,6 +723,7 @@
715
  "Poll Manager","Poll Manager"
716
  "Polls","Polls"
717
  "Popular","Popular"
 
718
  "Position of Watermark for %s","Position of Watermark for %s"
719
  "Pregenerated product images files.","Pregenerated product images files."
720
  "Prev. month (hold for menu)","Prev. month (hold for menu)"
201
  "Catalog Price Rules","Catalog Price Rules"
202
  "Catalog Rewrites","Catalog Rewrites"
203
  "Categories","Categories"
204
+ "Category","Category"
205
  "Category:","Category:"
206
  "Chart is disabled. If you want to enable chart, click <a href=""%s"">here</a>.","Chart is disabled. If you want to enable chart, click <a href=""%s"">here</a>."
207
  "Checkbox","Checkbox"
352
  "FTP Login","FTP Login"
353
  "FTP Password","FTP Password"
354
  "FTP credentials","FTP credentials"
355
+ "Failed","Failed"
356
  "Failed to add a product to cart by id ""%s"".","Failed to add a product to cart by id ""%s""."
357
  "Failed to cancel the billing agreement.","Failed to cancel the billing agreement."
358
  "Failed to clear the JavaScript/CSS cache.","Failed to clear the JavaScript/CSS cache."
413
  "IPN (Instant Payment Notification) Only","IPN (Instant Payment Notification) Only"
414
  "If there is an account associated with %s you will receive an email with a link to reset your password.","If there is an account associated with %s you will receive an email with a link to reset your password."
415
  "If this message persists, please contact the store owner.","If this message persists, please contact the store owner."
416
+ "If you do not specify an option value for a specific store view then the default (Admin) value will be used.","If you do not specify an option value for a specific store view then the default (Admin) value will be used."
417
  "Images (.gif, .jpg, .png)","Images (.gif, .jpg, .png)"
418
  "Images Cache","Images Cache"
419
  "Import","Import"
460
  "Invoice voiding error.","Invoice voiding error."
461
  "Invoices","Invoices"
462
  "Is Closed","Is Closed"
463
+ "Is Default","Is Default"
464
  "Issue Number","Issue Number"
465
  "Items","Items"
466
  "JavaScript seems to be disabled in your browser.","JavaScript seems to be disabled in your browser."
522
  "Manage Content","Manage Content"
523
  "Manage Currency Rates","Manage Currency Rates"
524
  "Manage Customers","Manage Customers"
525
+ "Manage Options (values of your attribute)","Manage Options (values of your attribute)"
526
  "Manage Ratings","Manage Ratings"
527
  "Manage Stores","Manage Stores"
528
  "Manage Tax Rules","Manage Tax Rules"
529
  "Manage Tax Zones and Rates","Manage Tax Zones and Rates"
530
+ "Manage Titles (Size, Color, etc.)","Manage Titles (Size, Color, etc.)"
531
  "Manual","Manual"
532
  "Matched Expression","Matched Expression"
533
+ "Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
534
  "Mb","Mb"
535
  "Media (.avi, .flv, .swf)","Media (.avi, .flv, .swf)"
536
  "Media storages synchronization has completed!","Media storages synchronization has completed!"
629
  "Only mapped fields","Only mapped fields"
630
  "Optional","Optional"
631
  "Options","Options"
632
+ "Options is required","Options is required"
633
  "Order","Order"
634
  "Order #%s","Order #%s"
635
  "Order #%s (%s)","Order #%s (%s)"
723
  "Poll Manager","Poll Manager"
724
  "Polls","Polls"
725
  "Popular","Popular"
726
+ "Position","Position"
727
  "Position of Watermark for %s","Position of Watermark for %s"
728
  "Pregenerated product images files.","Pregenerated product images files."
729
  "Prev. month (hold for menu)","Prev. month (hold for menu)"
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mage_Core_Adminhtml</name>
4
- <version>1.7.0.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Magento Administration Panel</summary>
10
  <description>Magento Administration Panel</description>
11
- <notes>1.7.0.1</notes>
12
  <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
- <date>2012-06-20</date>
14
- <time>11:26:41</time>
15
- <contents><target name="magecore"><dir name="Mage"><dir name="Adminhtml"><dir name="Block"><file name="Abstract.php" hash="53b42a69d31aef2d705eb2907ac4096f"/><dir name="Api"><file name="Buttons.php" hash="115dd77ba94468b3d80e556eaf4e2a28"/><file name="Editroles.php" hash="735a5daa8cdffcb7b3f4329091e8dd8a"/><file name="Edituser.php" hash="d8678e64c378e9e35370eef3bd884660"/><dir name="Grid"><file name="Role.php" hash="a2a9b30b00399ac2f16eef7d8d4e2de2"/></dir><dir name="Role"><dir name="Grid"><file name="User.php" hash="0211c7e077b4fee9f86ea48c024bfbb3"/></dir></dir><file name="Role.php" hash="961dad9e56d008082734c5d7038dd499"/><file name="Roles.php" hash="29d49d57a9242aee1544708681ad243f"/><dir name="Tab"><file name="Roleinfo.php" hash="c71d4cea8adc4a87c6a0b02234da0681"/><file name="Rolesedit.php" hash="dc56eb3840e413940998552ccf692bba"/><file name="Rolesusers.php" hash="fe667b2b4f640fa44c88b8b0ca20c06f"/><file name="Userroles.php" hash="809407afa1c0a41698aeca3e0d0982ba"/></dir><dir name="User"><dir name="Edit"><file name="Form.php" hash="5864b3fab1808fa3e5b2e8579115a7a7"/><dir name="Tab"><file name="Main.php" hash="f2a603eba2643105c2d10c50c71214c8"/><file name="Roles.php" hash="48db546936de7c14ac65aea67ef30342"/></dir><file name="Tabs.php" hash="a868cb54e325e382d13eb2b0e6087c06"/></dir><file name="Edit.php" hash="2f67d4e2a556ced20da960f4206996b2"/><file name="Grid.php" hash="53580953a3931d127f9e3639b2ae3738"/></dir><file name="User.php" hash="d20415fbd7fdc525dc0a18891d120033"/><file name="Users.php" hash="71209efcbc122fe629cbb23a300f8d68"/></dir><dir name="Backup"><file name="Dialogs.php" hash="f2c15eead546c2ec7f2fb70921d1b157"/><file name="Grid.php" hash="255cbcfe274247d8326781e817e817ee"/></dir><file name="Backup.php" hash="87db0bbc532771b4319544766267daee"/><dir name="Cache"><file name="Additional.php" hash="8d6b760e1eae392db3043fc608ce5b1b"/><file name="Grid.php" hash="2760c6c5a65d550dc1215dfbdec7e757"/><file name="Notifications.php" hash="a90f6926a5c2126d5328799613721695"/></dir><file name="Cache.php" hash="65c921b80d2c94d10aa7de682ec58e7f"/><dir name="Catalog"><dir name="Category"><file name="Abstract.php" hash="0c978c5e415938620e6f01bf4b1e8655"/><dir name="Checkboxes"><file name="Tree.php" hash="ce785862f5b0e786f54ee6da18618343"/></dir><dir name="Edit"><file name="Form.php" hash="944afdb0d8d4e4b513d4c71dcbd25363"/></dir><file name="Edit.php" hash="c07e26e39044d965e8e4141d15a96e8a"/><dir name="Helper"><file name="Image.php" hash="17f391d259497efa8877b59f870f2c08"/><file name="Pricestep.php" hash="2ce3b639995f85f18f6961a4ab66f83a"/><dir name="Sortby"><file name="Available.php" hash="54a9d288d0705832da8ab1db9d66ff2c"/><file name="Default.php" hash="5fa1bd1388e912be8cadbb3ca915fe6e"/></dir></dir><dir name="Tab"><file name="Attributes.php" hash="a8ce9ee8bde0fe798d2a981e49a286de"/><file name="Design.php" hash="fb0c2b67d547ba1b7e1f6bd4f27cfa09"/><file name="General.php" hash="d24f1b5a7fb2dbc246dd5a796dffd6f5"/><file name="Product.php" hash="3e5405c0e568429499d2ace4737dda1a"/></dir><file name="Tabs.php" hash="d177c39d04e834ae27672a356f4bb9f6"/><file name="Tree.php" hash="d3fcfe3158c1ff8d17ebf30db9367473"/><dir name="Widget"><file name="Chooser.php" hash="90b2ea626a6fec8b89af3e0446b90e61"/></dir></dir><dir name="Form"><dir name="Renderer"><dir name="Attribute"><file name="Urlkey.php" hash="d3a6dad8d004f59cb7d6481c6389b745"/></dir><dir name="Config"><file name="DateFieldsOrder.php" hash="20b4000b60254aae8022c70fe502b447"/><file name="YearRange.php" hash="24f6b6ec3031143ca7f3121eabcdee74"/></dir><dir name="Fieldset"><file name="Element.php" hash="c6580590cb5f17d469d39498ebbe6c17"/></dir></dir></dir><file name="Form.php" hash="5e1aadbb6b445fa824996bbd9c26fa4f"/><dir name="Helper"><dir name="Form"><dir name="Wysiwyg"><file name="Content.php" hash="4b1e9946d22bdd8f354b7a094b80ec91"/></dir><file name="Wysiwyg.php" hash="e05c5aadda1c25161ca89ce7dec3abcd"/></dir></dir><dir name="Product"><dir name="Attribute"><dir name="Edit"><file name="Form.php" hash="b2a5ee97b15776dbf0b3df76c7b61695"/><dir name="Tab"><file name="Front.php" hash="816118c6aac436833d88e807e517e28b"/><file name="Main.php" hash="3f7c56ee2bc12306daabdd2169612ded"/><file name="Options.php" hash="8320337e8404b988cdc0c023030a3e19"/><file name="System.php" hash="b00ff96aa183a27b5870b1f79774d38a"/></dir><file name="Tabs.php" hash="ea82087fb3941a943b4e6f781d396a34"/></dir><file name="Edit.php" hash="11893ab0100c8081cae56588c11e7ab2"/><file name="Grid.php" hash="4e64920e9a1387fa5cc774cb5c9569f5"/><dir name="New"><dir name="Product"><file name="Attributes.php" hash="8199aee9c651eda7eee9d92d31895881"/><file name="Created.php" hash="5bb3cc15a7965f5be2cced4a293d5e42"/></dir></dir><dir name="Set"><file name="Grid.php" hash="f821944a710e581fb1c0d4444e6e52b5"/><dir name="Main"><file name="Formattribute.php" hash="0e9daadc70323784563d8e5b48c0434d"/><file name="Formgroup.php" hash="2ceb67da9e4711744b89b02ee48d1cdd"/><file name="Formset.php" hash="b9f37c657ff0183d1b0b0e9ec03307c4"/><dir name="Tree"><file name="Attribute.php" hash="a847eed55ec642070174116ed2afc704"/><file name="Group.php" hash="9749af82a07c60ffad4bf346f9527bd9"/></dir></dir><file name="Main.php" hash="2640bac615d5fe3a532b57e2b8192605"/><dir name="Toolbar"><file name="Add.php" hash="d2fc89ab8956eb14aabcf585e3882608"/><dir name="Main"><file name="Filter.php" hash="71b12f3246ce2b71284edf9dd8109ef0"/></dir><file name="Main.php" hash="1b36255e6d3cd91ce27c2a5a077ee473"/></dir></dir></dir><file name="Attribute.php" hash="457cdcffc8af95ec2fff16ee7b5df3f5"/><dir name="Composite"><file name="Configure.php" hash="db8712677adce784037e008c331b7622"/><file name="Error.php" hash="e68bd05438739df588a71a1dc7adb945"/><dir name="Fieldset"><file name="Configurable.php" hash="c1ef7fe7bf30835dbb1ef5f1a7c53b22"/><file name="Grouped.php" hash="436fd607a122629f4b3cc7dfb9ffedf0"/><file name="Options.php" hash="eeede9c876ad971e28c52066ca9ced8a"/><file name="Qty.php" hash="fb860b4d54e75101507a8d3a1df2235f"/></dir><file name="Fieldset.php" hash="5c232092ec09b2fb2c2bf778b48b6790"/><dir name="Update"><file name="Result.php" hash="ee1dfb3d9286477f96e9d2f38a93d886"/></dir></dir><file name="Created.php" hash="ac18043088c35e3b189e7e7e597cc143"/><dir name="Edit"><dir name="Action"><dir name="Attribute"><dir name="Tab"><file name="Attributes.php" hash="1913cabb608987933e87ba8a40217294"/><file name="Inventory.php" hash="6eb2c129a07e65ac4d4c7cf84557ab70"/><file name="Websites.php" hash="8c40cca484c458e32a2f8e1e0fa86c9f"/></dir><file name="Tabs.php" hash="fcc683092220c4513592cc7c80959561"/></dir><file name="Attribute.php" hash="266783048cba204adf2da18b11895f36"/></dir><file name="Js.php" hash="ab78eeff7389412259c3f87dcfe3501c"/><dir name="Tab"><dir name="Ajax"><file name="Serializer.php" hash="05e4a011165b2bd03a16e46db9d92f9d"/></dir><dir name="Alerts"><file name="Price.php" hash="bca8f08f497b8ea9a69fb081ea04d787"/><file name="Stock.php" hash="a96ba525284da2d53256c09b5f275195"/></dir><file name="Alerts.php" hash="9821422b1e68b6974ab9d3922f7c45b5"/><dir name="Attributes"><file name="Create.php" hash="bd57a3cb7149d165242c12f3b80216d2"/></dir><file name="Attributes.php" hash="11d4aac6bb245604b612735b7ab8c1c7"/><file name="Categories.php" hash="205acdfb85c9a2e3d7b4bf39148131f1"/><file name="Crosssell.php" hash="b8adf4f8f894895d5206f13704b50b0f"/><file name="Inventory.php" hash="86358e59722cfb27960ea0d0754004a1"/><dir name="Options"><file name="Option.php" hash="84b969376a404bb13784a17874fa971e"/><dir name="Type"><file name="Abstract.php" hash="fa334da8ecf1fc97ac963eeaa5a523de"/><file name="Date.php" hash="74c9ffd6fc308569190d4eccea6ddae0"/><file name="File.php" hash="3a814a81c69972bd7f3650cc39472d78"/><file name="Select.php" hash="7175096d087a60a005375556733b7a03"/><file name="Text.php" hash="d031f4c8dab63eb03c5ea03febaea058"/></dir></dir><file name="Options.php" hash="260d85140dbe93984dc5ad12714cee9b"/><dir name="Price"><dir name="Group"><file name="Abstract.php" hash="a9363539050bd206b9dbd7d14148bbc6"/></dir><file name="Group.php" hash="84e704ff56ef7bca0ca1a5bc2d6cf967"/><file name="Recurring.php" hash="79b6d81201aed60ef6a3bd8128d46839"/><file name="Tier.php" hash="b48b0d43bd65d3eee65820701c732679"/></dir><file name="Price.php" hash="41e7a39ddd584e168772f904aeadbcb5"/><file name="Related.php" hash="2c4678c2cd1acf4f94f46eddc292e30a"/><file name="Reviews.php" hash="2a2d335f924dc4761cbd07f944aa40de"/><file name="Settings.php" hash="8e9f72e22c7c4751074c21d5ba398816"/><dir name="Super"><dir name="Config"><dir name="Grid"><dir name="Filter"><file name="Inventory.php" hash="7c249fe9b56ff41b672b338d17f33346"/></dir><dir name="Renderer"><file name="Checkbox.php" hash="de7dfc952ba306d9d4c3a445fe5be52b"/><file name="Inventory.php" hash="bf57717f6a09fb2ae986356bfea6f9b0"/></dir></dir><file name="Grid.php" hash="6f9e7b4767da9df1928397660945c7c4"/><file name="Simple.php" hash="7774d32e74cfd797178ec3b60d04ae9f"/></dir><file name="Config.php" hash="de6ec0b2d5335cdae3495b06cbce36ff"/><file name="Group.php" hash="2785336fb72c8161f850f5c55073492d"/><file name="Settings.php" hash="4fe9619abf262e8c88adafafd62f6a68"/></dir><dir name="Tag"><file name="Customer.php" hash="c3cdfd983887631b074751631c031081"/></dir><file name="Tag.php" hash="c84b9a3de382b41f6b95404bb4ef0f0e"/><file name="Upsell.php" hash="d0f1d868084b9749e5fcddffde81ba18"/><file name="Websites.php" hash="e9a8f9d9a0105c368d2d7018b1a7a761"/></dir><dir name="Tabs"><file name="Configurable.php" hash="79af35153959f94a78b59e7049407b5b"/><file name="Grouped.php" hash="516d6963a1d127edddce283789cb7278"/></dir><file name="Tabs.php" hash="589efabfc8118d88b2aaf85448644fdd"/></dir><file name="Edit.php" hash="b989b8b6160a6183ff72de9b20a2bf2b"/><dir name="Frontend"><dir name="Product"><file name="Watermark.php" hash="1e8811286bfcec762d47fef09128d7c9"/></dir></dir><file name="Grid.php" hash="f9257851e0e767daafc2cb62b905c7b7"/><dir name="Helper"><dir name="Form"><file name="Apply.php" hash="c3b58dcf89042c0bd95c5d7e52f57dec"/><file name="Boolean.php" hash="a5ae66b43dd5e05c1f6a1de852011ce2"/><file name="Config.php" hash="4edf2bf935d92453dfe42a6684ce791f"/><dir name="Gallery"><file name="Content.php" hash="b154bfd5bae2e1d421332c94678dba2b"/></dir><file name="Gallery.php" hash="34deb18e36b5f4da936cadc75d3c46e9"/><file name="Image.php" hash="8b923f3a3f11778002f7682ef99e36ab"/><dir name="Msrp"><file name="Enabled.php" hash="134d299c4db7620d13062b2d0b363880"/><file name="Price.php" hash="77e540c231d67a27677489f0bc8b2fc9"/></dir><file name="Price.php" hash="e52dff647d4334f31a01500beb9492a8"/><file name="Weight.php" hash="b79b915dfd0fbfe84472c89ad345f286"/></dir></dir><file name="Price.php" hash="5649a48a8158cbb30cd94f0ffcd89516"/><dir name="Widget"><dir name="Chooser"><file name="Container.php" hash="1dfb7a93f7f796b73a2514206dec84ad"/></dir><file name="Chooser.php" hash="b5bc36040e0525aeaa6a8021c9fa44b5"/></dir></dir><file name="Product.php" hash="8773e35cadb4e8859d9be56ba4a3db93"/><dir name="Search"><dir name="Edit"><file name="Form.php" hash="4e03e0ecbee0cf55b821249467842711"/></dir><file name="Edit.php" hash="96e19dcc7749ab9029f56715b50673ba"/><file name="Grid.php" hash="c2ba6e5b2522e2c437ff349e8d1b0ab7"/></dir><file name="Search.php" hash="275774b584978b7bc882437e12cb0553"/></dir><file name="Catalog.php" hash="fe3dac6e1e774aa7e2177df0212fac51"/><dir name="Checkout"><dir name="Agreement"><dir name="Edit"><file name="Form.php" hash="5b042386fcb0b04dd8da70ec79fa0242"/></dir><file name="Edit.php" hash="dfbc214b1c71bc235b7da68fb0ccf8ed"/><file name="Grid.php" hash="e33a3be50fdddb81817b9a1603531dc7"/></dir><file name="Agreement.php" hash="8beb26e27ad662e806e2322e0b433d10"/></dir><dir name="Cms"><dir name="Block"><dir name="Edit"><file name="Form.php" hash="b5d957fa7d9c934307c8eb9a305e617b"/></dir><file name="Edit.php" hash="d64fc9f41327a466908c9ce317ce0ac7"/><file name="Grid.php" hash="d7a11ee1f569d55d31ad1cbaae40944a"/><dir name="Widget"><file name="Chooser.php" hash="85690edac9ed87f2cc138b7823e4064e"/></dir></dir><file name="Block.php" hash="2d313ebc18f48ee0b19fc91776e9f141"/><dir name="Page"><dir name="Edit"><file name="Form.php" hash="40c12421162d14007d6970951a9afdaa"/><dir name="Tab"><file name="Content.php" hash="fbaa5d542cd960631cd49e801c0442fb"/><file name="Design.php" hash="d19fe21766db10836daa8c9bc2c0ebea"/><file name="Main.php" hash="06b7a2b9b36d03c3d1ba018d25c45563"/><file name="Meta.php" hash="d85cfdc972fb7e13e12e5ac0d628bee7"/></dir><file name="Tabs.php" hash="8e1e208deaeb6b7fe9a0b35147543299"/></dir><file name="Edit.php" hash="b713e134c027fbfe6f3becaa7b6aa489"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="1ffe1c276d333534ed41ad0ced78b907"/></dir></dir><file name="Grid.php" hash="dc977013d61157a74a1b16d333363fbc"/><dir name="Widget"><file name="Chooser.php" hash="2bc2583c77f14ef84aa576db93cac153"/></dir></dir><file name="Page.php" hash="541ee026b0fe64f2507928d7b06d23b6"/><dir name="Wysiwyg"><dir name="Images"><dir name="Content"><file name="Files.php" hash="96ba466e162a5b304e05581a1b9981c2"/><file name="Newfolder.php" hash="e53addca9a2a2a705e97bd493c57833c"/><file name="Uploader.php" hash="d46965540d2986ff74f9c2c030f2dbb4"/></dir><file name="Content.php" hash="fa97cc6ae723a62eeb137dcb23851225"/><file name="Tree.php" hash="6de3fa85978962413118cfc15b5f8f82"/></dir></dir></dir><dir name="Customer"><dir name="Edit"><file name="Form.php" hash="1f67c823a7d95c05e6d12dbeb7f1d8a8"/><dir name="Renderer"><dir name="Attribute"><file name="Group.php" hash="f9b1d5a51d30447a7d9f7071586ee877"/></dir><file name="Newpass.php" hash="ac4fa9dc5051438082627e92ea7c0a2c"/><file name="Region.php" hash="935c7de8fa4e2c1163618797c2ab38bc"/></dir><dir name="Tab"><file name="Account.php" hash="d4c9799e34518b5c5289668365c93659"/><file name="Addresses.php" hash="e4121c55eab7cbb0c6af0e84d1f88372"/><file name="Cart.php" hash="704f6094406649bfbedbd39c7890e9ec"/><file name="Carts.php" hash="5b9ae5af7979e6ad450582586c53ce53"/><dir name="Newsletter"><dir name="Grid"><dir name="Filter"><file name="Status.php" hash="404518e659f008dc468a7a1dbe040ade"/></dir><dir name="Renderer"><file name="Action.php" hash="ca18c1b4906525ab2e3e5a269ae1dcb4"/><file name="Status.php" hash="d8645cd46eb22ea70d4d82378e0963a9"/></dir></dir><file name="Grid.php" hash="25367c8354688f0847b88bf550f83909"/></dir><file name="Newsletter.php" hash="4882fc412b8937f9067d697f6faf1b23"/><file name="Orders.php" hash="bdde89330eb08260b1379983e7321e4f"/><file name="Reviews.php" hash="5e1b838e3ff6ac5d56690cf6dbb64c21"/><file name="Tag.php" hash="b79a5b5aa7c3b8cd3b65a2e30ae1469c"/><file name="Tags.php" hash="8d1c6dc24d4a37d1682da0325d38a3f4"/><dir name="View"><file name="Accordion.php" hash="a2c3d532cd50646f5e815f9caabd5656"/><file name="Cart.php" hash="2aa9e930c24e676b27d5fd50474023e3"/><dir name="Grid"><dir name="Renderer"><file name="Item.php" hash="c988a1a9a991a134ea1a5fbe6d68276a"/></dir></dir><file name="Orders.php" hash="7672de0cdc21ef105996c16ee644309a"/><file name="Sales.php" hash="6d0a1b107cf09d6764c6f8fd78808210"/><file name="Wishlist.php" hash="364912121436991e7d1c9398037fbb42"/></dir><file name="View.php" hash="41c5ae6f7bbdfa16eaef03e91e706cdd"/><dir name="Wishlist"><dir name="Grid"><dir name="Renderer"><file name="Description.php" hash="1bf1fc06f45f416d170f9bcc261e52bc"/></dir></dir></dir><file name="Wishlist.php" hash="e59f38cc4235c7a830b6b2334dcbc335"/></dir><file name="Tabs.php" hash="6ba18346d8e0520459e55d58495e36f3"/></dir><file name="Edit.php" hash="2fca97b88871844d210e351c3b5742cf"/><dir name="Form"><dir name="Element"><file name="Boolean.php" hash="c3eba0cf0a275acfce2955d2c9ffab4b"/><file name="File.php" hash="57c6d939785f37f9be36b949584ad8a3"/><file name="Image.php" hash="8e30e22534e84f2e3722003eba8a42af"/></dir></dir><dir name="Grid"><dir name="Filter"><file name="Country.php" hash="2360da5365a2a664995303ed085883b8"/></dir><dir name="Renderer"><file name="Multiaction.php" hash="c391f8801220e72f76481478b31b8a91"/></dir></dir><file name="Grid.php" hash="4518e5afc4473eb08e973dedd2ec1edf"/><dir name="Group"><dir name="Edit"><file name="Form.php" hash="1f1df0e6c5a584d2b7301fb219b09b50"/></dir><file name="Edit.php" hash="b67d188206333589523601a4c1d219aa"/><file name="Grid.php" hash="ec763fd7ce236348758b45b29b20d796"/></dir><file name="Group.php" hash="b3755d0f4366a676f03a4887faf4d3d6"/><dir name="Online"><file name="Filter.php" hash="b2bd25737e4727ba8310c5dc2d1dbb12"/><dir name="Grid"><dir name="Renderer"><file name="Ip.php" hash="97ee5727f0ad75a5b40d9a6caeecc833"/><file name="Type.php" hash="eaf4a19cfcaf4bb30c93c67c051223f6"/><file name="Url.php" hash="f3a4d5a5b4d5098c5e0b73ccaed8ac6c"/></dir></dir><file name="Grid.php" hash="3f19e5385ef5cb69f43e15aeef74173f"/></dir><file name="Online.php" hash="0787792efbe234fc4e2df613808900a2"/><dir name="Sales"><dir name="Order"><dir name="Address"><dir name="Form"><dir name="Renderer"><file name="Vat.php" hash="01aaf14152ac06217a8400356649ba87"/></dir></dir></dir></dir></dir><dir name="System"><dir name="Config"><file name="Validatevat.php" hash="5aaf00eb2cca3dfeec1b3665f0316727"/></dir></dir></dir><file name="Customer.php" hash="32ab30684b2aabf842f967f1683d4b18"/><dir name="Dashboard"><file name="Abstract.php" hash="2c253435cce388df5a197eab1d77d928"/><file name="Bar.php" hash="1dff629a9b97f824147d6b30701e6ea8"/><file name="Diagrams.php" hash="95eff5c8e043737184875c12ea87cbc6"/><file name="Graph.php" hash="684420eadfcf98899d03f561c87fa49c"/><file name="Grid.php" hash="11c613cca8bba7999771235cab393375"/><file name="Grids.php" hash="bc6b072d69b344f994e2559ad5c6449d"/><dir name="Orders"><file name="Grid.php" hash="f5622dcc2a518544b998cf777e715891"/></dir><file name="Sales.php" hash="ab82fad334b83311b02092734a4cf319"/><dir name="Searches"><file name="Last.php" hash="767e7780e18ec0d32d96aae1d65ffaa0"/><dir name="Renderer"><file name="Searchquery.php" hash="1e03c74d5ee803ac3d460754141ecc91"/></dir><file name="Top.php" hash="2a4ffa076302cd0745779f236b6a672b"/></dir><dir name="Tab"><file name="Amounts.php" hash="30c83e67bb51b8e0e0f9798357054721"/><dir name="Customers"><file name="Most.php" hash="b19de2aa8748f57f6cb53995bb0f6732"/><file name="Newest.php" hash="9c40aec4ea8fe9d7ca6090bfe4fe0cc3"/></dir><file name="Orders.php" hash="e6e519e9e73c1ec0dbf9d79c92933525"/><dir name="Products"><file name="Ordered.php" hash="26bcebbcbbbe6488974450641ec75e8e"/><file name="Viewed.php" hash="b5c48691370918ebdf018605b4b246b8"/></dir></dir><file name="Totals.php" hash="5abd849ccb91a02321ba63571cf47ad8"/></dir><file name="Dashboard.php" hash="7a5c20c71cd953a0bec242a50d0cf2f1"/><file name="Denied.php" hash="f6a41c1e97c577d9d745e56d8e0f09ae"/><dir name="Html"><file name="Date.php" hash="b5ff869c0f0a06135ba9b921cd34de45"/><file name="Select.php" hash="3648ca25e82c38dc60c3e5f39a6eeb02"/></dir><dir name="Media"><file name="Editor.php" hash="0d11443384e50f6b806c913475fd5f0b"/><file name="Uploader.php" hash="d68caceacd62d1fa36957f86c8085b43"/></dir><file name="Messages.php" hash="1d8432d98e4aa22a9053573c5bf1bf83"/><dir name="Newsletter"><dir name="Problem"><dir name="Grid"><dir name="Filter"><file name="Checkbox.php" hash="27328cfe0233814da04e9f6c1fc131f5"/></dir><dir name="Renderer"><file name="Checkbox.php" hash="0a5e922b4366c2e95ea0be575a3cdcac"/></dir></dir><file name="Grid.php" hash="5e166b2cd85b547f19c54e0280184795"/></dir><file name="Problem.php" hash="4fa51e468a3c4db6d29b1842420bf8ee"/><dir name="Queue"><dir name="Edit"><file name="Form.php" hash="773a047ee251ae1350e46a7a282649fc"/></dir><file name="Edit.php" hash="f785659b997832c9d9d3b63e27b89063"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="fe64a891232018af2e78b98736cc340e"/></dir></dir><file name="Grid.php" hash="c49483bf58812f3d50d3eb69f41ced17"/><dir name="Preview"><file name="Form.php" hash="99e0a1e3c4a11f7b6a4f65f0d6d1d810"/></dir><file name="Preview.php" hash="151517333a3ac06aab3969f0876730d6"/></dir><file name="Queue.php" hash="6021e448117668639524f993cdcbd7cd"/><dir name="Subscriber"><dir name="Grid"><dir name="Filter"><file name="Checkbox.php" hash="fd998f8e65693573e39c92ab3a17232b"/><file name="Website.php" hash="4d8cf5b420123757f92793ce5e2abbe3"/></dir><dir name="Renderer"><file name="Checkbox.php" hash="e7ba04406e9f366aa4b39753a5d400f5"/></dir></dir><file name="Grid.php" hash="c6c108ed7a3067c34731258d62ea6597"/></dir><file name="Subscriber.php" hash="75707b916967fc4d57fd29b43d5caabd"/><dir name="Template"><dir name="Edit"><file name="Form.php" hash="64af63c76e53ca0e7cfd1cccfc4c8ef0"/></dir><file name="Edit.php" hash="bc548fd086881945f4d5ad924026b36d"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="c2afa936d9ecc3b0573a05da33dde71b"/><file name="Sender.php" hash="a71a7b6dba43f05e25629fd3cb035d35"/></dir></dir><file name="Grid.php" hash="6b8bb178b2d1b77447978c0e7a22c2a0"/><dir name="Preview"><file name="Form.php" hash="dcd628972558049eb8abb5ea652e4196"/></dir><file name="Preview.php" hash="0eafa1bb35ad125efc1205a5ce07a621"/></dir><file name="Template.php" hash="611bff6f6008ae66f39032fb6ec29304"/></dir><dir name="Notification"><file name="Baseurl.php" hash="b43405ce792ad7edee1968516f34a0d3"/><dir name="Grid"><dir name="Renderer"><file name="Actions.php" hash="de1f7ab8fb7724c48afe2fcced9f873e"/><file name="Notice.php" hash="8726368b8e7ec53926dd7f2f5bdc6d60"/><file name="Severity.php" hash="c683c35f2fe5a344bb83988bf09c5c77"/></dir></dir><file name="Grid.php" hash="072527c3a7726c47b6f50da33295ffa2"/><file name="Inbox.php" hash="5a18096ad982a113b71ab6e6860bcc8f"/><file name="Security.php" hash="675ae7ca843ddf8f8199aab79647ab5e"/><file name="Survey.php" hash="68644fb08262b784ac5e151a9f2be516"/><file name="Toolbar.php" hash="d4e3c2fdfac722fd42a1083a10b3ea65"/><file name="Window.php" hash="8634439c6f5ae9f69f17937bfa70c667"/></dir><dir name="Page"><file name="Footer.php" hash="8c49520346ceb8e3e8939f6281e32650"/><file name="Header.php" hash="5426ef4d316a29cec8af7cdbbe8ddc7e"/><file name="Head.php" hash="39b37c239ae5e5d08cd5b286bb738ee8"/><file name="Menu.php" hash="0c04492c0505f2e1967c24fb2046df24"/><file name="Notices.php" hash="3309010d9c346de51249b2d5430ba016"/></dir><file name="Page.php" hash="905c99e69cc25a6684445f5243704bb1"/><dir name="Permissions"><file name="Buttons.php" hash="2d8f94c73753826b763ce42a3ffae60a"/><file name="Editroles.php" hash="47d1810ca6499e5d6787f1fbef5374fd"/><file name="Edituser.php" hash="4199b5a39cda4363f52c70d4d3270fa9"/><dir name="Grid"><file name="Role.php" hash="906b7ff7855609c254bf6c14f0930803"/><file name="User.php" hash="fc2cf10f1567c13aa75b6527247af03e"/></dir><dir name="Role"><dir name="Grid"><file name="User.php" hash="48bb038198ad6dfdc10e7c3a091b4575"/></dir></dir><file name="Role.php" hash="04dacab6ee85cc0d69a956f0f0ad14c3"/><file name="Roles.php" hash="154e1357e3eff259f07ccf7a1d00bb15"/><dir name="Tab"><file name="Roleinfo.php" hash="82a7491d798ec14094fc176420643688"/><file name="Rolesedit.php" hash="378e7c5d8f317cc385f2417df5211dae"/><file name="Rolesusers.php" hash="f126f26b2792559aa50efd0c69363ca4"/><file name="Useredit.php" hash="b13a8cc120b060e475ba8026e0a53f55"/><file name="Userroles.php" hash="9aa888a193e427c94983a783de16bc6b"/></dir><dir name="User"><dir name="Edit"><file name="Form.php" hash="68985dd665feeb66951846848f872010"/><dir name="Tab"><file name="Main.php" hash="b8bf177adb948bc922be1da5b359f7a4"/><file name="Roles.php" hash="756890d000e32cb735d226252b87c9f0"/></dir><file name="Tabs.php" hash="1f0dd9cce2617cad71d71f4c91a07a94"/></dir><file name="Edit.php" hash="20eec3e21ad2770af84460dba54fda9e"/><file name="Grid.php" hash="f4ffb5496a1934cc8eb7126a1df2f13d"/></dir><file name="Usernroles.php" hash="6a035788fec7189cf4dc97271bf570eb"/><file name="User.php" hash="e360099816c9656f5130a43598a13a90"/><file name="Users.php" hash="9e341375e22eda09a5cb27b8d6d3d2d4"/></dir><dir name="Poll"><dir name="Answer"><dir name="Edit"><file name="Form.php" hash="4bfed771a28806968633419858d64e29"/></dir><file name="Edit.php" hash="9f7c8a112fb2772f08cf2662294fd151"/></dir><dir name="Edit"><file name="Form.php" hash="8cafa662c3d52986c17ed90b61a9235f"/><dir name="Tab"><dir name="Answers"><file name="Form.php" hash="dfa737df8ef8b17dd927a11462dd8198"/><file name="Grid.php" hash="a52202e6fa2a8fed97f7907358137fa6"/><file name="List.php" hash="350511c992f6b450a534e5907048454c"/></dir><file name="Answers.php" hash="216729d3c08ca4e194251421188c2315"/><file name="Form.php" hash="c037172c9360ceb6687361eadde31572"/></dir><file name="Tabs.php" hash="7aa230e5dfb85b55a686050e3a4c213e"/></dir><file name="Edit.php" hash="906dec054c66a503b66141de415f6984"/><file name="Grid.php" hash="a5439be1bf5d522c5960500bc0333cdb"/><file name="Poll.php" hash="ab65e526141180fee21fb080998b2731"/></dir><dir name="Promo"><dir name="Catalog"><dir name="Edit"><file name="Form.php" hash="366019ebd0ccd8db4ebd232f9725431c"/><file name="Js.php" hash="357320086429b2eb7531a3769edd963f"/><dir name="Tab"><file name="Actions.php" hash="53b9041f1673192c30e17d64b762bc71"/><file name="Conditions.php" hash="ddcf3f3eabf2c9f9ec405ed5ae9562c0"/><file name="Main.php" hash="f81f31457a5f516f8a1cbb2f2c2fb8d3"/></dir><file name="Tabs.php" hash="6aa79be9bcd9942dd212ad4f15b272f8"/></dir><file name="Edit.php" hash="83909b12bc0ddfcd76feb829f84f883d"/><file name="Grid.php" hash="674e8840d78a809b9501b8cc43d53723"/></dir><file name="Catalog.php" hash="b5211f53a9366ff6d89a385041ab87dd"/><dir name="Quote"><dir name="Edit"><file name="Form.php" hash="8cd82a0acd841e1f06bd074fdc5e47d1"/><dir name="Tab"><file name="Actions.php" hash="f7f9509da5f5ffd1f2dc32da5612fb4a"/><file name="Conditions.php" hash="8a41cabf3a83fcce4b1c0c898bd6f8b4"/><dir name="Coupons"><file name="Form.php" hash="d65c3539f0491161ad57e8b27f77ae4e"/><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Used.php" hash="54de464af088aee9169d8f743799c226"/></dir></dir></dir><file name="Grid.php" hash="7a408cc67c9a1d4dd8f6ea30a3789ae8"/></dir><file name="Coupons.php" hash="a2bafe1bd2acb9ff32fe4224e5ae23a1"/><file name="Labels.php" hash="f7f35e061f1aa1b553cc0fd7c7d61885"/><dir name="Main"><dir name="Renderer"><file name="Checkbox.php" hash="923b4cfe40de914dd5d2acd3de037976"/></dir></dir><file name="Main.php" hash="b5f6ffd15cadd1400bd75076afa2505b"/></dir><file name="Tabs.php" hash="7468afb6e606417730d28c98cb88f60f"/></dir><file name="Edit.php" hash="b1b2dc6eb040ce318e66cf75675aa691"/><file name="Grid.php" hash="a67c49c7541f440d2a0f9d955c81870f"/></dir><file name="Quote.php" hash="ff3ac474f106910b8316d29cfabb449b"/><dir name="Widget"><dir name="Chooser"><file name="Daterange.php" hash="f364065bb1fd33d3084a9c7ec5d5b62f"/><file name="Sku.php" hash="47823d19d74e2668271306aaca96dcb4"/></dir><file name="Chooser.php" hash="5dd2db922f774f9ef5bc133f5b73914e"/></dir></dir><dir name="Rating"><dir name="Edit"><file name="Form.php" hash="a20493e978ad9f63e34124d1a8fa702a"/><dir name="Tab"><file name="Form.php" hash="e50eae7616af3979f8bf132396c017df"/><file name="Options.php" hash="d389f9d997170f928d520fc9d8cd62a7"/></dir><file name="Tabs.php" hash="5c37d2716ef64468384f9f9c08ce2a02"/></dir><file name="Edit.php" hash="4cbe46ac483a382c5b0d4f432f409887"/><file name="Grid.php" hash="3f46c5d4a0bb03bf400253f2745110f5"/><file name="Rating.php" hash="e4ec3d1ee079c06c111df6597e98c641"/></dir><dir name="Report"><dir name="Config"><dir name="Form"><dir name="Field"><file name="MtdStart.php" hash="b7e794a820eec5ec6c7b7f52e098a270"/><file name="YtdStart.php" hash="2948bc632bb766815c7c4799400ec337"/></dir></dir></dir><dir name="Customer"><dir name="Accounts"><file name="Grid.php" hash="2778a89e9131c675a5a5a8dec6e942f1"/></dir><file name="Accounts.php" hash="272f82a80ac14c55f3534a299aed8063"/><dir name="Orders"><file name="Grid.php" hash="7e4bb427c4ef90a02d5ad904ceb0533e"/></dir><file name="Orders.php" hash="be1a5209635fe03f0092058d99865185"/><dir name="Totals"><file name="Grid.php" hash="00fb47d6438e692ef6c1c16f86c45a50"/></dir><file name="Totals.php" hash="ef65187756a49473b0e9c405bab5d079"/></dir><dir name="Filter"><file name="Form.php" hash="594626d42c60d0bdeb57cb9250d0e184"/></dir><dir name="Grid"><file name="Abstract.php" hash="d29f43b9a2d94a91ec1602ea0537c39d"/><dir name="Column"><dir name="Renderer"><file name="Blanknumber.php" hash="6ba66348b5a6eff6e19113b66a584e5c"/><file name="Currency.php" hash="08552aa4c1ecf1a4d19bafb7399641f3"/><file name="Customer.php" hash="5082dd297349a9b5c87e87299252ae12"/><file name="Product.php" hash="8ed018e20a7b6853f470466de66cbe75"/></dir></dir><file name="Shopcart.php" hash="744091fd45f9938c058c85948a658dd1"/></dir><file name="Grid.php" hash="cfa1814a2bcd4a73ff422f92d9e73b5d"/><dir name="Product"><dir name="Downloads"><file name="Grid.php" hash="dc75e5c67ad9663fc68f9d6c71437b40"/><dir name="Renderer"><file name="Purchases.php" hash="f502e5c393dc03b4e5f8e78da0ded198"/></dir></dir><file name="Downloads.php" hash="c5004e44d5bb1278d3593e2434c86f29"/><file name="Grid.php" hash="0330ef1725a7f157832292f9b9013619"/><dir name="Lowstock"><file name="Grid.php" hash="63af0020df0141b913e323d5da6fda23"/></dir><file name="Lowstock.php" hash="b3028fed057a18ea9669eb2f5518b61f"/><dir name="Ordered"><file name="Grid.php" hash="e718c64bca9c33bdf3e935960f1dd878"/></dir><file name="Ordered.php" hash="deb8ec1ed3b4f82251c587fd2cf48fb6"/><dir name="Sold"><file name="Grid.php" hash="f7a4f9db1384262d634bd707e6c0a1fd"/></dir><file name="Sold.php" hash="066e395437a81d880137e798cfa988d3"/><dir name="Viewed"><file name="Grid.php" hash="275243dd04bc2e0f1426a3d1c3bb8910"/></dir><file name="Viewed.php" hash="645707e58cb85d78afef0b289fdb1010"/></dir><file name="Product.php" hash="db4f6012236776dfd85bbc16b815d734"/><dir name="Refresh"><dir name="Statistics"><file name="Grid.php" hash="59993b9f8b4d974b2085dda7dc05a241"/></dir><file name="Statistics.php" hash="c180df971455743d6da1a52807f56d44"/></dir><dir name="Review"><dir name="Customer"><file name="Grid.php" hash="2eff521c1ba20577395439d5b9eca528"/></dir><file name="Customer.php" hash="182a7fb38f78946c76189e121823efec"/><dir name="Detail"><file name="Grid.php" hash="f65690f700533d5a390701868163a9fc"/></dir><file name="Detail.php" hash="5f3bfa26465f55039298877cc4907746"/><dir name="Product"><file name="Grid.php" hash="d7d1bc964960ed7a8dfc41ab39b2e080"/></dir><file name="Product.php" hash="a3cf1d40c335cfa0b01b890994049c75"/></dir><dir name="Sales"><dir name="Bestsellers"><file name="Grid.php" hash="694ccdaae812489024ad9848c5957330"/></dir><file name="Bestsellers.php" hash="251f6afdd40946f73de5351e16ad1f0c"/><dir name="Coupons"><file name="Grid.php" hash="3bb6c12e21a617afe968ac1e3401c643"/></dir><file name="Coupons.php" hash="dff90b83dea3b5f38c823257b91d9a23"/><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Date.php" hash="d2872e3fae6515f34f39a7974d68c57d"/></dir></dir></dir><dir name="Invoiced"><file name="Grid.php" hash="c2c10598ee1ae9ca21078a69ed272820"/></dir><file name="Invoiced.php" hash="88146f6c673d3a292a574e7ed0f0fd7f"/><dir name="Refunded"><file name="Grid.php" hash="026555affde919e6e506952cdfeb4358"/></dir><file name="Refunded.php" hash="8a7a60a05354fc0868e237dee5a97192"/><dir name="Sales"><file name="Grid.php" hash="7872edef6f951e40d0fb6b9beb4cb4e3"/></dir><file name="Sales.php" hash="eb0e82644f06bf361e6679b2e5ec31b4"/><dir name="Shipping"><file name="Grid.php" hash="3339df1a2b3fd29abffa4f495b5509e1"/></dir><file name="Shipping.php" hash="b040e173164099301780ea613ad95539"/><dir name="Tax"><file name="Grid.php" hash="71b6cd01406688664bf1614b2b4d3756"/></dir><file name="Tax.php" hash="cf5e008aa6439b3ee77f16efc0314620"/></dir><dir name="Search"><file name="Grid.php" hash="3caff793f4824d1e460a8dee3a99fafd"/></dir><file name="Search.php" hash="dac5eb49b7365cf07e7c7d17f19ca73c"/><dir name="Shopcart"><dir name="Abandoned"><file name="Grid.php" hash="46ceffcb15bb877767d0a9382fcbead7"/></dir><file name="Abandoned.php" hash="bb6a4909e58a7aeb9626ef4bd8e3fc7a"/><dir name="Customer"><file name="Grid.php" hash="0d1ea6cace71efbc1102f54d9675d5b4"/></dir><file name="Customer.php" hash="0442ed711c913e4c3ab75e2ca1b0c897"/><dir name="Product"><file name="Grid.php" hash="67190fd4040bf1a5462a586d97613348"/></dir><file name="Product.php" hash="637a5f67b78c3b7adf8c9cebdc935db9"/></dir><dir name="Tag"><dir name="Customer"><dir name="Detail"><file name="Grid.php" hash="e0f1c4991ade19241b8f4e4529d22ff8"/></dir><file name="Detail.php" hash="cdb9f399b0e305659b65208d758670c3"/><file name="Grid.php" hash="43c9530abf6048b5e803324db8b3cc6c"/></dir><file name="Customer.php" hash="4069a6347441a215131160d743c4cd06"/><dir name="Popular"><dir name="Detail"><file name="Grid.php" hash="2482157fc28888a102456a6b4cafe26e"/></dir><file name="Detail.php" hash="c169efc938282bf5250c2a6ca887807c"/><file name="Grid.php" hash="33d5f2702882e20f412e0a2ac36b7b5c"/></dir><file name="Popular.php" hash="1f81903374a1c309f8820cb138a7ab07"/><dir name="Product"><dir name="Detail"><file name="Grid.php" hash="08cd79f5028bfa8be4d6c07645df8994"/></dir><file name="Detail.php" hash="d11ad677a09f7855dd3e1f1d422b28c2"/><file name="Grid.php" hash="4f703ffd247e1f66d0b3b0a451e278a3"/></dir><file name="Product.php" hash="e6665ecce188369e581712866a24fdaf"/></dir><dir name="Wishlist"><file name="Grid.php" hash="ab0286f5e36f904640c19028000bb01a"/></dir><file name="Wishlist.php" hash="ec6d256a94bf3dcd9aaf39d203849994"/></dir><dir name="Review"><dir name="Add"><file name="Form.php" hash="56bf164b6ecdf98342e7642644d8c178"/></dir><file name="Add.php" hash="fa72fce55ff1318280dbb34cd5629954"/><dir name="Edit"><file name="Form.php" hash="a9d2054906ca07d7e2b16a6770a13044"/></dir><file name="Edit.php" hash="15d3319a1e929e7e6a2ecee56501e353"/><dir name="Grid"><dir name="Filter"><file name="Type.php" hash="669aae31ae5cbf51808fcb586b36c6aa"/></dir><dir name="Renderer"><file name="Type.php" hash="b2ea92b6ef4f0614aefbb838695350da"/></dir></dir><file name="Grid.php" hash="7ac1239e3e2cc84796761a9da0c8e094"/><file name="Main.php" hash="83c6d8b6260bd583a0d6f68cb2d22ad0"/><dir name="Product"><file name="Grid.php" hash="8167b5e4a46a94fa3eab9f0ee4cd9ea3"/></dir><dir name="Rating"><file name="Detailed.php" hash="f63bf1f8d448cbb911a967f3270a36cc"/><file name="Summary.php" hash="013dc97e0185064835fdc2c4fe5a22b8"/></dir></dir><dir name="Sales"><dir name="Creditmemo"><file name="Grid.php" hash="c4a1f39de8abe7ea83a01e1ee5a16586"/></dir><file name="Creditmemo.php" hash="c259723a459e96d6d4c1899468b1acbf"/><dir name="Invoice"><file name="Grid.php" hash="39e48fe20697e2c2079407f1dba74a81"/></dir><file name="Invoice.php" hash="b490ea546ca3ea4616afd7475d23405c"/><dir name="Items"><file name="Abstract.php" hash="6379c9df3f5a84e932c3debbf7fd1481"/><dir name="Column"><file name="Default.php" hash="202962fcc80455be4618e97b71b45cca"/><dir name="Name"><file name="Grouped.php" hash="ed980c1b3f0d856010319b65defd4347"/></dir><file name="Name.php" hash="0f4e6208ad7c0dc854aa2d2e9dc23b30"/><file name="Qty.php" hash="20395201ea4d3d9f2dbd6718c58b5816"/></dir><dir name="Renderer"><file name="Configurable.php" hash="06a612b88e1ae7120300a458244beeef"/><file name="Default.php" hash="666e2849d849e9d34b86b1a4b6ea3da1"/></dir></dir><dir name="Order"><file name="Abstract.php" hash="2f582275680709414844bcf82b5909ad"/><dir name="Address"><file name="Form.php" hash="86c7a6e77cf865c6a77fe1784bdc7a54"/></dir><file name="Address.php" hash="7741b06df68a43f65767fbe2f0c127d4"/><dir name="Comments"><file name="View.php" hash="b278f98b5675af15179532a6830e7aa2"/></dir><dir name="Create"><file name="Abstract.php" hash="6bb963cf90afea780fa9ee110e607972"/><dir name="Billing"><file name="Address.php" hash="efc7801c43907ee53094db1a4fa33913"/><dir name="Method"><file name="Form.php" hash="4438b545d0b6346af662b7d5a0f9849b"/></dir><file name="Method.php" hash="446630a7239a71b1006e6f7bd5d963ce"/></dir><file name="Comment.php" hash="d0ad0cc2ecf47e33c9179e55934672cb"/><dir name="Coupons"><file name="Form.php" hash="bd756b7d5afe9c90382bf3501413ec79"/></dir><file name="Coupons.php" hash="eda36213353d81a0ddf86ab99d9b363a"/><dir name="Customer"><file name="Grid.php" hash="26f9fdbd09416b033d6214c0fa01f19c"/></dir><file name="Customer.php" hash="dd8fd753af0b7aff400d10fe6da541d5"/><file name="Data.php" hash="0b30cbafbffbf3ede0f1f289dceeb004"/><dir name="Form"><file name="Abstract.php" hash="536539808dbf32bce86ec52da256fbe4"/><file name="Account.php" hash="fd9a9f9ed757fe42a1899ecf48983fa9"/><file name="Address.php" hash="cbec5798b7560fe4564dac9c8f16efdf"/></dir><file name="Form.php" hash="8dea1bbf8ed55a18abe57dd2a1e59060"/><dir name="Giftmessage"><file name="Form.php" hash="6ea1ab3ab506e3fcceb7cdba7ad4473d"/></dir><file name="Giftmessage.php" hash="4fe7f5c8f0d999357f966ebb71ca313d"/><file name="Header.php" hash="712e9819d6bc9076c9f00e7dee9f574a"/><dir name="Items"><file name="Grid.php" hash="490e3a79bad8fd90419765fc7e8d498e"/></dir><file name="Items.php" hash="bf391229d7c134d6129b418f3196a27a"/><file name="Load.php" hash="4d0a0d5e514ee949471b50b7ed6b9b36"/><file name="Messages.php" hash="75af4ef9b5b59b9c6d1145007a68b101"/><dir name="Newsletter"><file name="Form.php" hash="4d59a328f752fdbc8fe64f416872c270"/></dir><file name="Newsletter.php" hash="d42e97f915a574932d0a4f7da398c9a6"/><dir name="Search"><dir name="Grid"><dir name="Renderer"><file name="Giftmessage.php" hash="983b469b4b4611b89e1286a2df5bc48f"/><file name="Price.php" hash="9cd65fed3c1c28b0afed46ac3dac62e6"/><file name="Product.php" hash="c00d623e6e2730e087863dbd2563a222"/><file name="Qty.php" hash="1b91861788836d0eed9418dfe5fce79b"/></dir></dir><file name="Grid.php" hash="fb30a20b5ef3706251acfccf3eefa675"/></dir><file name="Search.php" hash="f2237c924f9a7940d76d6434c2ec76e1"/><dir name="Shipping"><file name="Address.php" hash="42ec18c0e08eed1800dd78724618fc46"/><dir name="Method"><file name="Form.php" hash="32b9c6fb37b034c88421beac815c47c8"/></dir><file name="Method.php" hash="b1d335ee63015220607540c8b557b86e"/></dir><dir name="Sidebar"><file name="Abstract.php" hash="bec232895a7f54f7ec4d4b8451c27c75"/><file name="Cart.php" hash="976cf428bbea0a94b1c0cb7e2df527d0"/><file name="Compared.php" hash="b852b8253b8ec5dd72b96233085846b4"/><file name="Pcompared.php" hash="575dd5832544c66a2b1a397413f09f5d"/><file name="Pviewed.php" hash="5afa4f5f9d4e623d2974113ae35406bf"/><file name="Reorder.php" hash="f85c533b24778908c9d74e5b722a9ca7"/><file name="Viewed.php" hash="5dfe61d49ef2dcff4a5aeea67b788ccc"/><file name="Wishlist.php" hash="ea760d2c5a4683c3538cb8900a0de59a"/></dir><file name="Sidebar.php" hash="c6ed9e9efca9c85fb90acdb781b9ecad"/><dir name="Store"><file name="Select.php" hash="ed7f3fb6fe3fe3cd08598ba93b895a5e"/></dir><file name="Store.php" hash="ba646b9ff50c07648b14440120df0a4f"/><dir name="Totals"><file name="Default.php" hash="854960cd219bf160ab5152e80cfa9c64"/><file name="Discount.php" hash="6977e0d75d53c1af098a3e3269d60296"/><file name="Grandtotal.php" hash="7192072a594106a19ca2604f16ffdd22"/><file name="Shipping.php" hash="db339b84f661a7ba47505d0d4169f4e7"/><file name="Subtotal.php" hash="a0bde6b3f8294c75fbb9343fc07af7f6"/><file name="Table.php" hash="66cfec8d9b55a39c898197d41eb30946"/><file name="Tax.php" hash="8fbc8e7772efece93b92df114abbe002"/></dir><file name="Totals.php" hash="a1ce91a04f27e566020e2532b5f21dc5"/></dir><file name="Create.php" hash="7abbbb385299f3e22f365b142b58e2fb"/><dir name="Creditmemo"><dir name="Create"><file name="Adjustments.php" hash="25e91807a27b96e155f88fa2583c2038"/><file name="Form.php" hash="e3e655bc6f8bac175cfcc639070712ed"/><file name="Items.php" hash="1be79c55c103fe213db5e04045e1789a"/></dir><file name="Create.php" hash="29d7ac9f5ff4baceaa3da443f724fb24"/><file name="Totals.php" hash="f7dc27bd242f6c690d4bbefae4135da8"/><dir name="View"><file name="Comments.php" hash="7d80685a6c0e188068d38a09f3b1539e"/><file name="Form.php" hash="9c59d77a17273b9ad2a3bdad14001dbc"/><file name="Items.php" hash="8916bed8fca0aba89fe42f775b511a40"/></dir><file name="View.php" hash="48a1e0fea436f5a705b058e35fdd26e5"/></dir><file name="Grid.php" hash="46555b5331d9f04ab295377165091153"/><dir name="Invoice"><dir name="Create"><file name="Form.php" hash="f4bcd31bf6fbcbe099c4f8fe01c461f5"/><file name="Items.php" hash="b8e7d2503d8eff4639ef5c65301a4d29"/><file name="Tracking.php" hash="24ad47aba80b8ede77d22ca877d985e0"/></dir><file name="Create.php" hash="ac2871de83ce2da855c0e25cbf6f02c0"/><file name="Totals.php" hash="fa2a28ab9e1172137e0482b3e80fb99f"/><dir name="View"><file name="Comments.php" hash="a0205a4b2e708ad80df547689a7d11ef"/><file name="Form.php" hash="b867e96b889662ddbbb18d8aa5822fbb"/><file name="Items.php" hash="c180840d5664cd5403ab8910aaacbc78"/></dir><file name="View.php" hash="88def76232ddea38c9a40033631403c9"/></dir><file name="Payment.php" hash="c629d7dc9bc0561e8f0f8aac7cb05124"/><dir name="Shipment"><dir name="Create"><file name="Form.php" hash="8bdde842dce80ff0518379662d9f93e4"/><file name="Items.php" hash="8ce75d6ed610e2e9d154768b64138997"/><file name="Tracking.php" hash="c71f235d29d5d509977eeba98bf70bd6"/></dir><file name="Create.php" hash="1bca8dba6ae467457a72a6cfc8567472"/><dir name="Packaging"><file name="Grid.php" hash="42a0b58fdee89f84914b450a17632ad5"/></dir><file name="Packaging.php" hash="0f95239c4734dcd82e65e9d6b4b757d3"/><dir name="Tracking"><file name="Info.php" hash="477bbe39990640fb193efe0f6af27027"/></dir><dir name="View"><file name="Comments.php" hash="66355a28033733137406b8999dc76c47"/><file name="Form.php" hash="9268b7860fe9bc0d280cb6bb9a84f969"/><file name="Items.php" hash="296cf106d24ba8d8034d070f31cf820e"/><file name="Tracking.php" hash="b1c6782097686dfbe810d59b536d39c2"/></dir><file name="View.php" hash="0e59dc97264a0006c34849fa748cbf8b"/></dir><dir name="Status"><dir name="Assign"><file name="Form.php" hash="3b574a4bade03a20f00ca8dffda83f43"/></dir><file name="Assign.php" hash="9c146be917f31e2abe4f737cf37d0728"/><dir name="Edit"><file name="Form.php" hash="c71944d9838157b1973aff89061b6018"/></dir><file name="Edit.php" hash="1152f4683949e050cc66a66e3b985438"/><file name="Grid.php" hash="d3f85a0390aa1418ccee87887722642a"/><dir name="New"><file name="Form.php" hash="01b9bd8f6ca71dbce7fc536ef972eb5d"/></dir><file name="New.php" hash="10db76eb6201d390264e8c8a8b05f9b4"/></dir><file name="Status.php" hash="f337deb978e87d64203f8971edc4f014"/><file name="Totalbar.php" hash="3129a7fc712de6a3575187e9676c975c"/><dir name="Totals"><file name="Item.php" hash="3c2cdeb85a214e61fb2b2c2582fb47da"/><file name="Tax.php" hash="498837b3c3dc44a0f19d3d93724aeec4"/></dir><file name="Totals.php" hash="3d358e883dcdbb22bffdd67d8624d420"/><dir name="View"><file name="Form.php" hash="797d254bdef1e93dbb401c4bb2aa0c0c"/><file name="Giftmessage.php" hash="796fe5742a45875a56b887211e73131e"/><file name="History.php" hash="f72d14fa76b79f98dbb7890902fd907a"/><file name="Info.php" hash="b184bfb54420c66b14cbad35ace55488"/><dir name="Items"><dir name="Renderer"><file name="Default.php" hash="4938c018c27f321c7f7e37396aa5b45a"/></dir></dir><file name="Items.php" hash="cf9bebcdf82f5730d8782b4a004905e0"/><file name="Messages.php" hash="544b99086603fa55d21a741f4a8f5240"/><dir name="Tab"><file name="Creditmemos.php" hash="b0f5aa766ed40842443afb72d214c938"/><file name="History.php" hash="d3a33fbc71c5621f0f0d5d8037229756"/><file name="Info.php" hash="c8b8cf62622ca340402e7a04d5bda990"/><file name="Invoices.php" hash="f758b8b2d6664a2790c81c426e22644d"/><file name="Shipments.php" hash="d574a46ecc2729c0181ddbc118475f17"/><file name="Transactions.php" hash="57773e37ee5c155fbcbaad5b2407dcec"/></dir><file name="Tabs.php" hash="5f67a7d3e773be25089aea32d00562ca"/></dir><file name="View.php" hash="c8edb312bae910880545ae391c4c9595"/></dir><file name="Order.php" hash="809c500a091fe4905fa014e8386e6308"/><dir name="Reorder"><dir name="Renderer"><file name="Action.php" hash="3990ed6ccad89662d91b90075fe90baa"/></dir></dir><dir name="Shipment"><file name="Grid.php" hash="21cc978dfdf6c8094db951a752d4d21f"/></dir><file name="Shipment.php" hash="75180bf41a7bde2520f5cb12ea9f07a7"/><file name="Totals.php" hash="5a82628cad267628ecb034c4ec3c70c5"/><dir name="Transactions"><dir name="Child"><file name="Grid.php" hash="4996a2752cfe112fe1607531117fffa4"/></dir><dir name="Detail"><file name="Grid.php" hash="017a53abc12f697bea3591d25edcd134"/></dir><file name="Detail.php" hash="c78800ebb44f0afb963adb3b9ec592ac"/><file name="Grid.php" hash="b4b03fb489952093e0ddd91e01f99c71"/></dir><file name="Transactions.php" hash="7b5c11f52c24df60dbfe6c51bdd1740f"/></dir><file name="Sales.php" hash="edf8309ebeab6fe33dd95600cd03034e"/><dir name="Shipping"><dir name="Carrier"><dir name="Tablerate"><file name="Grid.php" hash="662ac71223b80be508e2c0bd50a97f97"/></dir></dir></dir><dir name="Sitemap"><dir name="Edit"><file name="Form.php" hash="86bb6acdbb125e28c6cbd67e5119159c"/></dir><file name="Edit.php" hash="6a30b2098d853845d158a087f4bba45a"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="34371c9777b58e4f00227c78e0fd9302"/><file name="Link.php" hash="07c72102b172f7d55ae9adafa8d09732"/><file name="Time.php" hash="7764d3a08592fd675ff23a2a3663a8e1"/></dir></dir><file name="Grid.php" hash="207039bfb0d3fb22acdd6bd160adb76d"/></dir><file name="Sitemap.php" hash="4a7b7a1ca8fd19c7592f53ad8c1e44ca"/><dir name="Store"><dir name="Switcher"><dir name="Form"><dir name="Renderer"><dir name="Fieldset"><file name="Element.php" hash="88c62f91c3602b855deb84ed5e60a7ce"/></dir><file name="Fieldset.php" hash="117aaff821f31808393ec06661eccccd"/></dir></dir></dir><file name="Switcher.php" hash="ec8470102402dfa196a50c8fb5bcc764"/></dir><dir name="System"><dir name="Account"><dir name="Edit"><file name="Form.php" hash="fc05abc4def5812044d7c9b873c61d30"/></dir><file name="Edit.php" hash="c04c11673816a8b79110afa6d77f7f1a"/></dir><dir name="Cache"><file name="Edit.php" hash="0a21bccbed3271e167bc96d22d0947cf"/><file name="Form.php" hash="ed570d7670fce0cfaa885ebc1dd2ce50"/></dir><dir name="Config"><file name="Dwstree.php" hash="71db90b52743d8a0da11b8a4d24428a8"/><file name="Edit.php" hash="3b6742af7962cc5529224faee5081a1d"/><dir name="Form"><dir name="Field"><dir name="Array"><file name="Abstract.php" hash="bb3db1b00fbf6eeb835501d6e83e6f6c"/></dir><file name="Datetime.php" hash="ae7c542c79e6cbae90119ea45cc99099"/><file name="Export.php" hash="feddb5223bfc29ac4ee843ebb47270e6"/><file name="File.php" hash="175d61fe48f5aa979b751f256409a33d"/><file name="Heading.php" hash="3f8d37900b6f4f722863bd435d8912a9"/><file name="Image.php" hash="bcd01f2329bb1389fa88cea69b9234bd"/><file name="Import.php" hash="487c7eab2917ad145d453f9877bf6d75"/><file name="Notification.php" hash="cd5e766dbbf522f9a5df1623ea107e5f"/><file name="Regexceptions.php" hash="1afb23fe757a06e30af5da84415e75e0"/><dir name="Select"><file name="Allowspecific.php" hash="20c37fe6a0da0066bf3d7e6c63758f44"/><file name="Flatcatalog.php" hash="482e52c560be75ae8a37c6a165372298"/><file name="Flatproduct.php" hash="03487cec9d96579bf74bb10c893236d5"/></dir></dir><file name="Field.php" hash="b3427c4f737b4c19556b9988f0afb2b3"/><dir name="Fieldset"><dir name="Modules"><file name="DisableOutput.php" hash="70f3a5518c22c376933b14da3c248ae3"/></dir><dir name="Order"><file name="Statuses.php" hash="2d2ca3d0d90766d2ec167e1ea05924e7"/></dir></dir><file name="Fieldset.php" hash="c60c819c5dd16929b004e7e46f7eb8d0"/></dir><file name="Form.php" hash="7f2babe63f8ee6930af3cfde34bc405e"/><file name="Switcher.php" hash="d1c13ed50c2ec89504cd270a0d9610e5"/><dir name="System"><dir name="Storage"><dir name="Media"><file name="Synchronize.php" hash="83bcdcddba34213ba77a08fdf7e55d8d"/></dir></dir></dir><file name="Tabs.php" hash="60abd7652c4e417012c0e70b1cee8805"/></dir><dir name="Convert"><dir name="Gui"><dir name="Edit"><file name="Form.php" hash="9bed4e1709b7cb11fd81db2e50e0fcd8"/><dir name="Tab"><file name="Upload.php" hash="a705ed7b82f571af858e19736f34d81d"/><file name="View.php" hash="848d387575c4483ef11d76a8e6bd8014"/><file name="Wizard.php" hash="36c985c4c43ff82668b9cab269ddb640"/></dir><file name="Tabs.php" hash="ab5cefa4001226f69be3aefdea77f639"/></dir><file name="Edit.php" hash="85b13a3d4080368597c74f0b1d9db436"/><file name="Grid.php" hash="01b8b912ff4941b4e86cf8d1aa805ce7"/></dir><file name="Gui.php" hash="830a2e87bd6e3f2fffab050002ba9508"/><dir name="Profile"><dir name="Edit"><dir name="Filter"><file name="Action.php" hash="351974be84c121a86145196c22a1dd4a"/></dir><file name="Form.php" hash="dfbc46ae10487b7c4117d449b8e6a16b"/><dir name="Renderer"><file name="Action.php" hash="b92f952011652d1e80a691e23f68cd2f"/></dir><dir name="Tab"><file name="Edit.php" hash="015a750d00160cecde022a2512205e16"/><file name="History.php" hash="26fa1dd0b5078510b5493fdacc10d00e"/><file name="Run.php" hash="ad4cd5ad7ed57b650968e601b01adfdf"/></dir><file name="Tabs.php" hash="3973b6ae9d5017ff6ce5dee81b8d47fd"/></dir><file name="Edit.php" hash="625f3e055895ec1f6617b9404795c500"/><file name="Grid.php" hash="47e8a56a7498993de8aec3f8e9a92d07"/><file name="Run.php" hash="e809d2af2b53c84ba1334b39978c4f10"/></dir><file name="Profile.php" hash="6988f2444e05f2959b4a493a7a71ab78"/></dir><dir name="Currency"><dir name="Edit"><file name="Form.php" hash="0b218d26cc8c265bb1182c45faa582db"/><dir name="Tab"><file name="Main.php" hash="6227018fdf1c0de00c0bb5a96edaa142"/><file name="Rates.php" hash="672212313e91bdd0c98a1960152e6d87"/></dir><file name="Tabs.php" hash="5ef967a7eae80b319755d17d1a5ed624"/></dir><dir name="Rate"><file name="Matrix.php" hash="0df3740f8b98b48affd96bba1866864b"/><file name="Services.php" hash="ff581dd71235e96d10127ce9b541b187"/></dir></dir><file name="Currency.php" hash="22db92e147ce56217b87360102a806eb"/><dir name="Design"><dir name="Edit"><dir name="Tab"><file name="General.php" hash="70145a86d112b2a809b50537ca2a9bfa"/></dir><file name="Tabs.php" hash="ca75118365f912aa522ac2aa9ddada57"/></dir><file name="Edit.php" hash="b8fbfb0bd2afcbcf049361db3ce806aa"/><file name="Grid.php" hash="7a03f6aeae0bd76a01177724e355f295"/></dir><file name="Design.php" hash="977bb4de279f50e31017d2021bc689b2"/><dir name="Email"><dir name="Template"><dir name="Edit"><file name="Form.php" hash="19b18d04305b77aed32cb58bf2400fd8"/></dir><file name="Edit.php" hash="bc8f27bc2178b208e7522010ec69dc81"/><dir name="Grid"><dir name="Filter"><file name="Type.php" hash="62a1496e48d2e7a0e8f55f77a87b060d"/></dir><dir name="Renderer"><file name="Action.php" hash="d35b2956751409b6a8c6313310360ba3"/><file name="Sender.php" hash="bbb6ffb031bccf24c57895b245869962"/><file name="Type.php" hash="4301753a59350ffb244e1698b4d14200"/></dir></dir><file name="Grid.php" hash="98b174917909bbc99175564b3d21ef9e"/><file name="Preview.php" hash="839c2a3b2b2c380a596b498f28bce75e"/></dir><file name="Template.php" hash="242f85e7eaaa998d657b8ca5de1b7a0b"/></dir><dir name="Store"><dir name="Delete"><file name="Form.php" hash="7c7f76148d9bb3fb97ead7a901a742ae"/><file name="Group.php" hash="0615f4a4ff2733bb41f16de41260aa2d"/><file name="Website.php" hash="2930165d09ed1fbd65c88dce4fc29a34"/></dir><file name="Delete.php" hash="ec18681aec75bbbb014edd396aa0c425"/><dir name="Edit"><file name="Form.php" hash="5762c0d055ac8cbb0805ee836529c137"/></dir><file name="Edit.php" hash="b17cdb08c158b8950ce634140150d2ec"/><dir name="Grid"><dir name="Render"><file name="Group.php" hash="ebf29a396e6c18c8c838c01178f3a830"/><file name="Store.php" hash="5ace4fa711ea50deb526f9effa93fa16"/><file name="Website.php" hash="4e4ecfd22d281bcb15c65d4e1749b670"/></dir></dir><file name="Grid.php" hash="f542b6fa1dd2b43ea94b9e2e51c3edee"/><file name="Store.php" hash="133f8f13b25771734dd1382660153f67"/></dir><dir name="Variable"><dir name="Edit"><file name="Form.php" hash="a8f9565984eaf2693ba0d6a04b37351f"/></dir><file name="Edit.php" hash="2d8b98565e0e0b0c849935bd3ae556a4"/><file name="Grid.php" hash="7183f511e5a2bbd92fc18a03ed93f31e"/></dir><file name="Variable.php" hash="38435c7e65a746f3b9293814b16da15d"/></dir><dir name="Tag"><dir name="Assigned"><file name="Grid.php" hash="7c8dea62d4051f8e03f9f198969091ae"/></dir><dir name="Customer"><file name="Grid.php" hash="331dd2fdb9a484f20bd966b301d1947f"/></dir><file name="Customer.php" hash="e89ae9f629d2fe6f4e542aa1078e6162"/><dir name="Edit"><file name="Accordion.php" hash="527555853d01fa09f50418c172988703"/><file name="Assigned.php" hash="a544010b175822f985096a5d2f957b70"/><file name="Form.php" hash="79c0fa81afc37d5404e0a4fa1ec1ea59"/></dir><file name="Edit.php" hash="9ee9ad5d3e0dcb1ff339ad00d7b73f0b"/><dir name="Grid"><file name="All.php" hash="32eb07e21a0fb62ed4119fa1fcd48f5b"/><file name="Customers.php" hash="57db1c5339cebdd6b538baafc560a8ae"/><file name="Pending.php" hash="33163c2bd7f5832518b6f505364d97a2"/><file name="Products.php" hash="03723d3284357432172e2b2dfcb411f6"/></dir><file name="Pending.php" hash="22d625309bbaeb4a30cb27100880e2b9"/><dir name="Product"><file name="Grid.php" hash="97dfcd5df83cc212411871a21340c37c"/></dir><file name="Product.php" hash="e4d1e3d51e7da99bf704227013dddfc6"/><dir name="Store"><file name="Switcher.php" hash="5a71155e05cba303869891543c27db7b"/></dir><dir name="Tag"><dir name="Edit"><file name="Form.php" hash="52cacefc9b23b9f47d4845ea3115291e"/></dir><file name="Edit.php" hash="86599e182ab4e361eb78dbe58416ae40"/><file name="Grid.php" hash="6959b8ca772dfba3d83109c6a30b656b"/></dir><file name="Tag.php" hash="a872226278779df516dac2ae8edc896e"/></dir><file name="Tag.php" hash="8468bdb90ba6a58dac7d3928845c6411"/><dir name="Tax"><dir name="Class"><dir name="Edit"><file name="Form.php" hash="b00c1d8c4988acc37af441cde81180ea"/></dir><file name="Edit.php" hash="920f4c91a2f270039e1d4de19e400151"/><file name="Grid.php" hash="65edf90da61d2821fb3f36936edefcec"/></dir><file name="Class.php" hash="36827ff472153548bf74bde1fc7f906c"/><dir name="Rate"><file name="Form.php" hash="b432af44688112329f50f6c234e1fe22"/><dir name="Grid"><dir name="Renderer"><file name="Country.php" hash="1c0119b6e19a54ed863ec8a302ca6345"/><file name="Data.php" hash="f4ceed0eb0482bfd24dfd8ec8caa4fd6"/></dir></dir><file name="Grid.php" hash="19463d9273d58982d49617b599aa0548"/><file name="ImportExport.php" hash="e3fe435dd21e72ff338bc749d4729142"/><dir name="Title"><file name="Fieldset.php" hash="ff48b81b25f77ef699b1ef2fe99c258c"/></dir><file name="Title.php" hash="eeee86ed3a1c86eff652795eb6d0fa6e"/><dir name="Toolbar"><file name="Add.php" hash="591c52520703ca76a27218c457ac8c1f"/><file name="Save.php" hash="630a0d3d307681a31955a9e29190579c"/></dir></dir><dir name="Rule"><dir name="Edit"><file name="Form.php" hash="9da981c87c9790bf3296add4e8857cf9"/></dir><file name="Edit.php" hash="9492e549f77795bb464386108dc01918"/><file name="Grid.php" hash="1af7ec8d3c9d6dafb08b42f1cb08f18d"/></dir><file name="Rule.php" hash="76767f20fab57c0cf5a0c6ef545af464"/></dir><file name="Template.php" hash="769b1180c6d2a13ef3c389be67d99c33"/><dir name="Text"><file name="List.php" hash="46ae4729ef1d0eb11897e241945927e1"/></dir><dir name="Urlrewrite"><dir name="Category"><file name="Tree.php" hash="462c6c2d07515df7ad68c0b8eb9a5ac4"/></dir><dir name="Edit"><file name="Form.php" hash="7f0455917a3fa36da50ea3c42c8590c9"/></dir><file name="Edit.php" hash="12512b60886a0c0ac197589f284a314d"/><file name="Grid.php" hash="4438429c1fe8deb5428a0346fd21b27d"/><file name="Link.php" hash="846128ed934143f48e03bd34bdcff86e"/><dir name="Product"><file name="Grid.php" hash="2bc055c61962cb65f9f233be4cd35873"/></dir><file name="Selector.php" hash="7b0f716faecb9e756886ed1092b4e463"/></dir><file name="Urlrewrite.php" hash="ef7fb4e75ffa6e8da1fc3126638390e0"/><dir name="Widget"><dir name="Accordion"><file name="Item.php" hash="ffcea17e2cb72a42416e298b0d052ebb"/></dir><file name="Accordion.php" hash="74230faf0ce077bb4aa9e9c5d2fc748d"/><file name="Breadcrumbs.php" hash="de4ced495442b9fbb59d41ff4f34a759"/><file name="Button.php" hash="aed450a5b167d3fb0168ffd32aa8546b"/><file name="Container.php" hash="a061486d4b4e9f5ea300678e6f7b8c50"/><dir name="Form"><file name="Container.php" hash="f8ec6f2ec0ad5a5a928c3b623943255a"/><dir name="Element"><file name="Dependence.php" hash="9ca180f8a2076620867cdfa6e5e9a9e7"/><file name="Gallery.php" hash="988530a1a877d3abf7a83d91d1f1c5ef"/></dir><file name="Element.php" hash="2535e979989c105437a55499ed52a9a7"/><dir name="Renderer"><file name="Element.php" hash="7f63ac885a516eca0dca7fd1cc79704d"/><dir name="Fieldset"><file name="Element.php" hash="929019b5574fce79cc836e919be9148a"/></dir><file name="Fieldset.php" hash="e50e6638abcc369e49158c489e8b5b28"/></dir></dir><file name="Form.php" hash="6d4e2bca75f0706d80a237d88c972154"/><dir name="Grid"><file name="Block.php" hash="b66c11fe8f4b19cc57f25f3fa23b9076"/><dir name="Column"><dir name="Filter"><file name="Abstract.php" hash="dd49d09cfcaab77c9d380c1d7a1ef4b6"/><file name="Checkbox.php" hash="a85c69b2abd43fbffb1e1dfd09f6cc8a"/><file name="Country.php" hash="02c04353dde7e3203305224274197954"/><file name="Date.php" hash="10a751a02d5a7d678708a651792150eb"/><file name="Datetime.php" hash="68a3847ebc47e57c5425b5a4d6657892"/><file name="Interface.php" hash="dcbdfc72eb0f75c8eb6b6f396116a7f3"/><file name="Massaction.php" hash="659994ae6abfee01168828757fbde085"/><file name="Price.php" hash="f989995be3439b9e3420f6d38e8af004"/><file name="Radio.php" hash="4ec1066639e7d5c74d95e65fdf79cf4d"/><file name="Range.php" hash="87e68bcd02eda31b2af973c8df05710b"/><file name="Select.php" hash="193a4c5521343268311cbf6b2276fffc"/><file name="Store.php" hash="3d82220f9b0783d45248f91ff0b23189"/><file name="Text.php" hash="ce3c227b7e0ff2e33858f0ed23b9af0e"/><file name="Theme.php" hash="a03590dab4bfbbc4c4826e8ecf0ba311"/></dir><dir name="Renderer"><file name="Abstract.php" hash="5023b01a262e2e3cfe2b432f26f76471"/><file name="Action.php" hash="e9753829a758fb6bff0ec0f4e5fffebe"/><file name="Checkbox.php" hash="71454a260b6181d26b69b83904f0eba5"/><file name="Concat.php" hash="dc34c16ddd23c4d53bacd6f658e5ef6a"/><file name="Country.php" hash="6cdfb116ce6955785e9ef07491c578d8"/><file name="Currency.php" hash="7266fb8583836db233838da9c59376b6"/><file name="Date.php" hash="646c7a389dc11e3f2cd85a41aaa55ecf"/><file name="Datetime.php" hash="b2b7c5f394bed6968fb091f6222ecccd"/><file name="Input.php" hash="62512b563ad5f313e7b8e9bd11f882f5"/><file name="Interface.php" hash="20459fc72a684aa23099ef4a1c2ffb6c"/><file name="Ip.php" hash="a87db675e939344676304780738b4b88"/><file name="Longtext.php" hash="8ea589d3a1c49d7cae1d1f938bd1e876"/><file name="Massaction.php" hash="b5be3c32f3834498a57211fca99aa573"/><file name="Number.php" hash="004014f04db0066be596f18bc677f00e"/><file name="Options.php" hash="dd4340697c5d1ae5e27de9cde79dc305"/><file name="Price.php" hash="f20ce3741d733433e00098ab9d5de6ab"/><file name="Radio.php" hash="9ebafbcc643eaba1a741871349c87bed"/><file name="Select.php" hash="fff0f4276ee8dfaa0f1f477f89b6a870"/><file name="Store.php" hash="8afeb271a3c9910ff81eb94d6c403f6b"/><file name="Text.php" hash="1b9e0375daa5b6b10bacb05c2be68ec5"/><file name="Theme.php" hash="d642114e093c7a780b8eb9d5ba8d1aac"/><file name="Wrapline.php" hash="008bb042fae88f87a132b9221401e42e"/></dir></dir><file name="Column.php" hash="f8d8f5c6cf044fc1f1354e8e6e7aece0"/><file name="Container.php" hash="493c64be0554e5a72eaed059bebad98b"/><dir name="Massaction"><file name="Abstract.php" hash="f2c5b20790a313408eb063135d66ed64"/><dir name="Item"><dir name="Additional"><file name="Default.php" hash="d0c12003c681e0c4e8575de41c7a1f67"/><file name="Interface.php" hash="f93f5f1b21540c8d86f209cc47854265"/></dir></dir><file name="Item.php" hash="f67082cefc7354af45036064b2eed475"/></dir><file name="Massaction.php" hash="43acb4376980dd09746cf2d7e3acc5ff"/><file name="Serializer.php" hash="554499a973fb572fb1e16a80bad6383b"/></dir><file name="Grid.php" hash="73de434df1a3598e6bc4f0ceb7aa14d3"/><dir name="Tab"><file name="Interface.php" hash="3cdbb7f8f2f3fbdefa553b578aa802f7"/></dir><file name="Tabs.php" hash="d40419e2eef725333835864826984791"/><file name="Tree.php" hash="03d655c8233d4263fc5c8a6b6ea90896"/><dir name="View"><file name="Container.php" hash="f35c7e09526af990ac8aa5f3ebe7ccdc"/></dir></dir><file name="Widget.php" hash="6114e9b299701d1e7cff782c54ce60b1"/></dir><dir name="Controller"><file name="Action.php" hash="3a9f7511ab3293d150446abb784293c0"/><dir name="Report"><file name="Abstract.php" hash="1487bd48071aa04462cef8eb3846ec92"/></dir><dir name="Sales"><file name="Creditmemo.php" hash="29af0fa650ce1d5f0b67b0b135f166c4"/><file name="Invoice.php" hash="11e0efb6b9b68e425dbaac298cdd7fc0"/><file name="Shipment.php" hash="828706cbba092a90a960034882acfcdd"/></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="f1777ea1cdb347a072a04fb861b07aef"/><dir name="Api"><file name="RoleController.php" hash="c82182fcc4828841648c4f53fda2beb5"/><file name="UserController.php" hash="ef284666e0d637d4108113e280283e3e"/></dir><file name="CacheController.php" hash="6aaf0bfb2d786dcee710bcad5db7ace3"/><dir name="Catalog"><dir name="Category"><file name="WidgetController.php" hash="03138bd9a16517988f0bdee225d19b65"/></dir><file name="CategoryController.php" hash="281fd0cd3a0b11782b76da4cc539a0f3"/><dir name="Product"><dir name="Action"><file name="AttributeController.php" hash="d83c7f23f0f161d1e885b9d792d0ff6d"/></dir><file name="AttributeController.php" hash="26d059a06f4ddb287f5635a588789660"/><file name="DatafeedsController.php" hash="168d80b71138ed106225d5f56b5d7daf"/><file name="GalleryController.php" hash="ee6ec7da1473ccbf6e3c7f67254921e1"/><file name="GroupController.php" hash="16e8323ce59809f6c40fe5f1e57c1171"/><file name="ReviewController.php" hash="2f5c1fc50aed5d470e742f05223975ee"/><file name="SetController.php" hash="70ab258bfe25ce6c8cbcc68fe56b1c01"/><file name="WidgetController.php" hash="a732ac69731348cbe4f2691ee7248392"/></dir><file name="ProductController.php" hash="4f71c28e31e3bb24d616824797067753"/><file name="SearchController.php" hash="745eccb882443e41ad649dfb3037cee3"/></dir><file name="CatalogController.php" hash="e84fba03e01185058d31d7f794be1f71"/><dir name="Checkout"><file name="AgreementController.php" hash="a7affd413a3c2fcdd80508562777b4a1"/></dir><dir name="Cms"><dir name="Block"><file name="WidgetController.php" hash="e8c4839dd6a307bd04cfb9b996908708"/></dir><file name="BlockController.php" hash="3304cdd2ae9ec78052d6f66e42b34a98"/><dir name="Page"><file name="WidgetController.php" hash="fc62fd6371698e17bd5f91d9e4deeed9"/></dir><file name="PageController.php" hash="521f7f0b184bd915d6cd5a2d2021cfc9"/><dir name="Wysiwyg"><file name="ImagesController.php" hash="17793668232948500ed8ac8bebfd4519"/></dir><file name="WysiwygController.php" hash="adb54dc262de8aae68e0a66ab736c120"/></dir><dir name="Customer"><dir name="Cart"><dir name="Product"><dir name="Composite"><file name="CartController.php" hash="11e0bc9422fd69b8afabb7bdb1549dea"/></dir></dir></dir><file name="ConfigController.php" hash="cd7984dc23fb2c74e3a1f2b8e1e2ce77"/><file name="GroupController.php" hash="643a5851af48f0063f7a8a6ab277562e"/><file name="OnlineController.php" hash="3d868cbe5126bc304e6dec6fbd7995ca"/><dir name="System"><dir name="Config"><file name="ValidatevatController.php" hash="a042f8b540c149863ca62c5bdc48caeb"/></dir></dir><dir name="Wishlist"><dir name="Product"><dir name="Composite"><file name="WishlistController.php" hash="7915e56dfd9de3270b5fac8825ced4a8"/></dir></dir></dir></dir><file name="CustomerController.php" hash="9944ac47cbe9d69f4071a0fc6ecf0f86"/><file name="DashboardController.php" hash="36839c4fe9a0efdfa0998175acd5af55"/><file name="IndexController.php" hash="99dde1cbd9b2c10c4768ae7563170040"/><file name="JsonController.php" hash="120772b9a4c6785f17e61fc52f6accb8"/><dir name="Media"><file name="EditorController.php" hash="cdd8c7edcadca9f2e9691e2f1fe30de2"/><file name="UploaderController.php" hash="bdfb5dc56dd5a3f2e6620350dfb29b58"/></dir><dir name="Newsletter"><file name="ProblemController.php" hash="09132d9870212ba25528a8b7bd9fbbdb"/><file name="QueueController.php" hash="3fbfd9ef8a7dc0d764f0c6c4a7a5f24f"/><file name="SubscriberController.php" hash="e6778ce9626a59ff28e6bdb978e0807f"/><file name="TemplateController.php" hash="ad3416aa8cdbf06a6abc888da02a560d"/></dir><file name="NotificationController.php" hash="38fdb06a78642d335d84394bdc0bf9dc"/><dir name="Permissions"><file name="RoleController.php" hash="c4603a2d9e5e35a969df5e50b65c6b95"/><file name="UserController.php" hash="07517e0e91c70b0e1460dd1e0d9df04e"/></dir><dir name="Poll"><file name="AnswerController.php" hash="acdc42fb73ebdaf2c5b9d90101ed17fa"/></dir><file name="PollController.php" hash="f5ab032a6170820af7abd980832678c0"/><dir name="Promo"><file name="CatalogController.php" hash="22dce2b5b6b3b064c6c9231a6a2f9833"/><file name="QuoteController.php" hash="8c51fc4e9dcb2bd174db70cb90277b37"/><file name="WidgetController.php" hash="e1b27463665e92e94e50e83e6ca667a8"/></dir><file name="PromoController.php" hash="8e1f2bcd2a9eda1c244353876fba39ff"/><file name="RatingController.php" hash="94f531c63dde06250950804ceac95bee"/><dir name="Report"><file name="CustomerController.php" hash="42b56c59327a8c230475d64f7139a151"/><file name="ProductController.php" hash="e221bd02418bbb7fb9e0a12edb0acd15"/><file name="ReviewController.php" hash="796d65bf7549e8f3b9391c39a32d6782"/><file name="SalesController.php" hash="5a5d26696e99dbcdc6ff620978e8e806"/><file name="ShopcartController.php" hash="cc3cee8a44e17de72c8554c4d3aa0514"/><file name="StatisticsController.php" hash="6e0a78fbc4367125b8ce577c6eac1900"/><file name="TagController.php" hash="dd1345e50d9588c98559c9475df13007"/></dir><file name="ReportController.php" hash="e7f0ebf457355927b3712b14b786edeb"/><dir name="Rss"><file name="CatalogController.php" hash="cc2e9f5aa9db536a6abd4cb9c8a63ca3"/><file name="OrderController.php" hash="232a467f5002da631393dc1c06689142"/></dir><dir name="Sales"><dir name="Billing"><file name="AgreementController.php" hash="0a5ee097331079eaabe5434bf7f1afdf"/></dir><file name="CreditmemoController.php" hash="c7fdf924ac5432c8c804429c5d537349"/><file name="InvoiceController.php" hash="a8e2f0f4591d9f56e56ef7ead27a20b2"/><dir name="Order"><file name="CreateController.php" hash="de7b73b62ddad186a3908e5ecef3afe5"/><file name="CreditmemoController.php" hash="55f6c8317e06ec4ca283dd2a6a14369f"/><file name="EditController.php" hash="054e551a299bd5f5891ad28d24220aa9"/><file name="InvoiceController.php" hash="2b8e5d7277090c19bf86dc990edcd312"/><file name="ShipmentController.php" hash="49a2173f68e21205e217ebfa19d55c29"/><file name="StatusController.php" hash="2bcf5920d894f9db7f54445a4eedfd88"/><dir name="View"><file name="GiftmessageController.php" hash="d2a0f33849b37b566a9dd1f4a351ed93"/></dir></dir><file name="OrderController.php" hash="e6fac6753a2379de0362700e217abd0b"/><dir name="Recurring"><file name="ProfileController.php" hash="71f41be78f5b4e13a9fe76ed8ca550be"/></dir><file name="ShipmentController.php" hash="69b87214408e7d99b49b4208df7bf915"/><file name="TransactionsController.php" hash="f5edc1406a16d69db4e1b81467075fab"/></dir><file name="SalesController.php" hash="8598000fe2a0f9ec98563727ab8b1475"/><file name="SitemapController.php" hash="df85db2f3cd41e9963e5aa4865ef3e9e"/><file name="SurveyController.php" hash="ef35d1d2bed55461ac8d1e23709152b3"/><dir name="System"><file name="AccountController.php" hash="acd8e6a411a46852fe6b57ed00de02d1"/><file name="BackupController.php" hash="f8603f85c21709d90248bd316ca963af"/><file name="CacheController.php" hash="d1addf8655272a012bc9e1b2e2c0fd7a"/><dir name="Config"><dir name="System"><file name="StorageController.php" hash="29da217c4a5dcc78e1c42bb11bb33ede"/></dir></dir><file name="ConfigController.php" hash="ef22783dfc4c29d48a336c06ccc13bf0"/><dir name="Convert"><file name="GuiController.php" hash="10e86d4ca439a29757517647a1c6c875"/><file name="ProfileController.php" hash="34e86d184b991b6395ee73f94292a05a"/></dir><file name="CurrencyController.php" hash="5d1eb0bb06a0b0926aef7b3e058b1d31"/><file name="DesignController.php" hash="a74cd7d666491588b39853d480715b3a"/><dir name="Email"><file name="TemplateController.php" hash="1d8273321c6eb996d5700797c018bfb9"/></dir><file name="StoreController.php" hash="5810a89a6e8df566883b5f0a6510dbf8"/><file name="VariableController.php" hash="76e80c14da111dc3097336e16e3311c4"/></dir><file name="SystemController.php" hash="0c3f1841ae54408088be89d9284ecd67"/><file name="TagController.php" hash="2b75039572cf9df0e30f72b65c59d14f"/><dir name="Tax"><dir name="Class"><file name="CustomerController.php" hash="a8f8b157d906778080e16521846a1632"/><file name="ProductController.php" hash="a4c473224eb0d9a2bf5d88d4be4c172c"/></dir><file name="ClassController.php" hash="c82ab6e29108cfad3f1771c13519fb0c"/><file name="RateController.php" hash="d53943c41850f999482457a36cd69892"/><file name="RuleController.php" hash="774331ad170045e420e2db7ee08ef88e"/></dir><file name="UrlrewriteController.php" hash="de3c6de21b59bf9bc6b17f92cf25a828"/></dir><dir name="etc"><file name="adminhtml.xml" hash="a86cda1acc07a5a0daf2733c625aba8b"/><file name="config.xml" hash="041bc63712cc3bdff887067e29a72858"/><file name="jstranslator.xml" hash="afac1927acdcf8472de935f56d3d0291"/></dir><file name="Exception.php" hash="8711d958c3bacebc981866a3bd419792"/><dir name="Helper"><file name="Addresses.php" hash="5d6411672017f16899a26efb2b9a5df6"/><dir name="Catalog"><dir name="Product"><file name="Composite.php" hash="23fb7ab9797af76c1b072f6f9ff7a330"/><dir name="Edit"><dir name="Action"><file name="Attribute.php" hash="019c217e1af30357a08f48ecd6cc87d7"/></dir></dir></dir></dir><file name="Catalog.php" hash="ed5000e6a38a726a268cdb577ab77b30"/><dir name="Dashboard"><file name="Abstract.php" hash="76863694a0755be7d062bccdc4d5428e"/><file name="Data.php" hash="8fc3f29c76730f635f8f5cf1cf586b4d"/><file name="Order.php" hash="918be1308e18232c53f959c22acc39bd"/></dir><file name="Data.php" hash="6dc51fb9e0643194a07305cbc98ca3e3"/><file name="Js.php" hash="d3f8f9c50e8413fbb72da4a2849418e7"/><dir name="Media"><file name="Js.php" hash="d5e68167a9edf05f589d057c2f959e85"/></dir><file name="Rss.php" hash="5defe8a706d1222699adea617eaebee3"/><file name="Sales.php" hash="94b96ea48498daee545e11809accd173"/></dir><dir name="Model"><dir name="Config"><file name="Data.php" hash="1fda1dd48ef5c5f30d77485d1cfb7ff8"/></dir><file name="Config.php" hash="d1a67e7fe005b5b4be81c25595b807b0"/><dir name="Customer"><dir name="Renderer"><file name="Region.php" hash="de91fb15a14e5531ad47f2bffe15f9d9"/></dir></dir><dir name="Email"><file name="Template.php" hash="b7d97164f88d467f9be4cca1ce2ba6b8"/></dir><file name="Extension.php" hash="528095ab59f532e9a19fb67ea04b873a"/><dir name="Giftmessage"><file name="Save.php" hash="96361b1ac08083d30230e5d8f57bbad2"/></dir><dir name="LayoutUpdate"><file name="Validator.php" hash="cf10cfa07b7fb5fe5ea03978c2c6466f"/></dir><dir name="Newsletter"><dir name="Renderer"><file name="Text.php" hash="130e9689d27af3c9ae0c9f6f8b9a7ad5"/></dir></dir><file name="Observer.php" hash="6a6b2129dff08f8b85c292c174a680e0"/><dir name="Report"><file name="Item.php" hash="4587ea582fcf8c200213ae64e789ec82"/></dir><dir name="Sales"><dir name="Order"><file name="Create.php" hash="69101280a3c40a92902905d25ea8abcf"/><file name="Random.php" hash="7d357780232a37d8f4ab6b69ddfa12fd"/></dir><file name="Order.php" hash="662457ceb6a98c870443b051b4fc55d4"/></dir><dir name="Search"><file name="Catalog.php" hash="0866d393b3970350afa2306e9f55e44f"/><file name="Customer.php" hash="a60025e035288a87284ed789de04fe20"/><file name="Order.php" hash="e6fd7d47b0e81c14afec35f7011bfd47"/></dir><dir name="Session"><file name="Quote.php" hash="eef6af9dffd5fb3a3e050cd50fd7cf69"/></dir><file name="Session.php" hash="2f2f49c24687c5a42e597e283fe09ce7"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Admin"><file name="Custompath.php" hash="33f26684dea4d3b8fb9736023bcf76af"/><file name="Custom.php" hash="089ccc7e875c9f36cde3ae5f84e145c2"/><file name="Observer.php" hash="37815760558f61fef9d641ebb8aba581"/><dir name="Password"><dir name="Link"><file name="Expirationperiod.php" hash="3b30bf0c1871ec5603952800ed4e00b8"/></dir></dir><file name="Usecustompath.php" hash="51c684635acd20b4c4f9664a780007c0"/><file name="Usecustom.php" hash="7f72ccd57a4f7991636aaa01a8ed4368"/><file name="Usesecretkey.php" hash="0b577d047099b106d4409acec1b5f674"/></dir><file name="Baseurl.php" hash="46883bc88568a5f9c7b67c7bba93da04"/><file name="Cache.php" hash="80c6d45dbd7cce845458d334810d7dd8"/><dir name="Catalog"><dir name="Inventory"><file name="Managestock.php" hash="c31e060c2eaee513a20f34111f4f2b98"/></dir><dir name="Search"><file name="Type.php" hash="1d34e93cf636142c4483235fab9a693c"/></dir></dir><file name="Category.php" hash="972a90c42ed1c97c6edc389bfbbf0e7a"/><file name="Cookie.php" hash="2d6d37619895ef27813a606f8253646c"/><dir name="Currency"><file name="Abstract.php" hash="96b35b725a756c08cc0443244d56a84b"/><file name="Allow.php" hash="3ec7d7b1c21c56ec1f31595ee4e3067a"/><file name="Base.php" hash="7e8aa2d76df0def3da09560654d79827"/><file name="Cron.php" hash="c29980353ebd21df66968e95cce7f2ff"/><file name="Default.php" hash="76c773f92fbb21564575c6d4c8684c66"/></dir><dir name="Customer"><dir name="Address"><file name="Street.php" hash="40c936f57ae7baee8cb5b3cf4e9be704"/></dir><dir name="Password"><dir name="Link"><file name="Expirationperiod.php" hash="69aded43263bb55473df87b081260071"/></dir></dir><dir name="Show"><file name="Address.php" hash="de3ee446eaa918dd688a3fbd86a01a19"/><file name="Customer.php" hash="6e3f86c0131fc1400f82425a488553a3"/></dir></dir><file name="Datashare.php" hash="fd455810c32efb1250ee1aa238ce9c62"/><dir name="Design"><file name="Exception.php" hash="0d219b40762ae3ed931213f0749b2e9c"/><file name="Package.php" hash="88cf23890c4814367f944504482b55a7"/></dir><dir name="Email"><file name="Address.php" hash="025de8aa7bb9329cc1a1f2330bbc5e6e"/><file name="Logo.php" hash="20e9b951f5804322bf70e9ee90fe570c"/><file name="Sender.php" hash="b52bbf40f1589b60c092a972296680b7"/></dir><file name="Encrypted.php" hash="ba6ab9cd3c527d8581db2634d7b87483"/><file name="Filename.php" hash="118d549de1ff38a7a11c6375b6214b63"/><file name="File.php" hash="192df84088f62e728c6af21e1ed1205c"/><dir name="Image"><file name="Favicon.php" hash="4955e8a4566945f12397cb3d99ebe239"/><file name="Pdf.php" hash="0799c47bbdad8d3798689acccef641ec"/></dir><file name="Image.php" hash="16ef8b48c83883f9d4a5e0bff894298e"/><dir name="Layer"><file name="Children.php" hash="0a191a45eb3d8845bacb5694b4e52b49"/></dir><dir name="Locale"><file name="Timezone.php" hash="d3d22f890f988b770ad5727b098b1a70"/></dir><file name="Locale.php" hash="6e28e5969976e737a3838a5768c3f7ae"/><dir name="Log"><file name="Cron.php" hash="a5868e196d1e46d6abd146c22782c906"/></dir><dir name="Price"><file name="Scope.php" hash="3167e244c91d964b5e38ecb0caea25c7"/></dir><dir name="Product"><dir name="Alert"><file name="Cron.php" hash="8c23f2af4b5132cc00a887fce5be32c4"/></dir></dir><file name="Secure.php" hash="213cba7f8e5912966efb70923acdb6b1"/><dir name="Seo"><file name="Product.php" hash="981f60437425e4ccc00e86d618d674ba"/></dir><dir name="Serialized"><file name="Array.php" hash="3d22345d60f724063a6c234296da0ee5"/></dir><file name="Serialized.php" hash="59dabdf0d417236041f32f433ba9972a"/><dir name="Shipping"><file name="Tablerate.php" hash="e1adb525f2b169e0498ee7168ce42e8b"/></dir><dir name="Sitemap"><file name="Cron.php" hash="e1d24bc3ec43c98097749e65a821bdfd"/></dir><file name="Sitemap.php" hash="9ae0784cbc77f726b81fe946e73d1f37"/><dir name="Storage"><dir name="Media"><file name="Database.php" hash="b70dc6bc636176802e92c57ac34cac52"/></dir></dir><file name="Store.php" hash="825764f0922ab3b722ede0e903fa675e"/><file name="Translate.php" hash="39d97929caa3817a47e745e3c8194dbf"/></dir><dir name="Clone"><dir name="Media"><file name="Image.php" hash="654b640fe2489da2797a487ddec99e03"/></dir></dir><dir name="Source"><dir name="Admin"><file name="Page.php" hash="575965671564d8a2f1c81650f4e6a30c"/></dir><file name="Allregion.php" hash="267b5814f6aebf3fae63163875213e93"/><dir name="Catalog"><file name="GridPerPage.php" hash="f0957fddf9dab15efb524bf49b841454"/><file name="ListMode.php" hash="4b61d8bd4a9b1256d280299ed759b0e5"/><file name="ListPerPage.php" hash="522408a02f9ccb772f11ccf19396b373"/><file name="ListSort.php" hash="de86cef5858a88f9462b845bf243543e"/><dir name="Search"><file name="Type.php" hash="3a0186df41871baf7b49329dfefbd692"/></dir><file name="TimeFormat.php" hash="8364c02d95ead25aaf3182621c6bbaf1"/></dir><file name="Category.php" hash="dc4491c363b81d92d8caed11cdb15781"/><file name="Checktype.php" hash="200936fa7121bb16a0669f4488f25541"/><dir name="Cms"><file name="Page.php" hash="10f3c573d3ecb9222687093c31058b4e"/><dir name="Wysiwyg"><file name="Enabled.php" hash="2077d03c4058539fd8351fd9c0401a40"/></dir></dir><dir name="Country"><file name="Full.php" hash="a919d975f0048e5eb4a70e24daa09b7a"/></dir><file name="Country.php" hash="64b1d5c0d561740bbe12b117f36514cb"/><dir name="Cron"><file name="Frequency.php" hash="4085ad8d86c8c71313c6793e68916475"/></dir><dir name="Currency"><file name="Service.php" hash="f418d52848ff92162c3bc1a27ec3e7d9"/></dir><file name="Currency.php" hash="d35b0bdbbe9181d24bbd8de6f78629a2"/><dir name="Customer"><dir name="Address"><file name="Type.php" hash="beb8f8c0dfca02a1db523ff9fa1d93d4"/></dir><dir name="Group"><file name="Multiselect.php" hash="540dcb8a84c07dbd2849d614a2a2d5bc"/></dir><file name="Group.php" hash="bc6f24b6d810def507e10fb3aaa70301"/></dir><dir name="Date"><file name="Short.php" hash="a6a324603a276ce919137ccd383c15c7"/></dir><dir name="Design"><file name="Package.php" hash="3b0f0eaa37d1503695cde1a28e8f182e"/><file name="Robots.php" hash="9a58c1a52ec10f32dc5ca71637a4eda7"/></dir><dir name="Dev"><file name="Dbautoup.php" hash="d619a56dd93f7dac6f766f80b7603cfa"/></dir><dir name="Email"><file name="Identity.php" hash="afcba708953b5c8ced9c9e91a159c0c1"/><file name="Method.php" hash="5a668d484a5c748bfca7901fc16e14e9"/><file name="Smtpauth.php" hash="e01fb631b6ee22822b5e5a6545d87238"/><file name="Template.php" hash="68d0e3e76f910052fe1cf0444557a70b"/></dir><file name="Enabledisable.php" hash="ffee349864c0f76da5d1c04f67e1a091"/><file name="Frequency.php" hash="a9e5129620d70d2610dbf215af9a2eed"/><file name="Language.php" hash="b6e26de17d96986c5f8e60974061a90e"/><dir name="Locale"><file name="Country.php" hash="ef71cbee5bfd8a01fffb4b94a93d0663"/><dir name="Currency"><file name="All.php" hash="d1576d3a17e4bdd613110cdf05ce9cef"/></dir><file name="Currency.php" hash="018e7f238e82c4ead729ea37eabfb50f"/><file name="Timezone.php" hash="555b8345852ec57503f73e5ebca51b52"/><file name="Weekdays.php" hash="4dc96de3d004d0a13f85b2db74a604a6"/></dir><file name="Locale.php" hash="4f734232eec2ec6eadfb65483d2de9be"/><file name="Nooptreq.php" hash="62d2f183714bf3a76677d2ce89d0abc0"/><dir name="Notification"><file name="Frequency.php" hash="a3c54e206d9bcd5c2381b3912754639e"/></dir><dir name="Order"><dir name="Status"><file name="New.php" hash="c2e9d7186e6ffd60de3f5d7842dcd9da"/><file name="Newprocessing.php" hash="0385ff3e72476ebbfef01e701f73913c"/><file name="Processing.php" hash="c6aa0b2f6b6b67deb97710f48757eff7"/></dir><file name="Status.php" hash="60f6a01dcbc0176b7e3c89a72045955c"/></dir><dir name="Payment"><file name="Allmethods.php" hash="3676b52a87669b1fe719d96ed26906cb"/><file name="Allowedmethods.php" hash="5c54998380303de84c4959025a0bf4df"/><file name="Allspecificcountries.php" hash="1c96d41b2e5d1975971de55a9c11b8ae"/><file name="Cctype.php" hash="db686b1c41418c3c444abbcf33016e3d"/></dir><dir name="Price"><file name="Scope.php" hash="52e34d323303f9893fbceaf2ee82bcde"/><file name="Step.php" hash="6e3144e7869bd4b86e9e2d9fedcbcf8c"/></dir><dir name="Product"><dir name="Options"><file name="Price.php" hash="621c6531014911943d8e26eb1a2d74d2"/><file name="Type.php" hash="b61680badb78655fb3f6b48f33332f73"/></dir><file name="Thumbnail.php" hash="cdecd9cb8539bb9893bdc7f4609f2326"/></dir><dir name="Reports"><file name="Scope.php" hash="2adbf471c9c2ed0e98ff7c9d99090a1d"/></dir><dir name="Shipping"><file name="Allmethods.php" hash="840e59190535b9aa44820ef24a8bf8de"/><file name="Allowedmethods.php" hash="affe1705d1a5b8d06203a58544bceede"/><file name="Allspecificcountries.php" hash="5f7359341e6608d46730547f1846a95b"/><file name="Flatrate.php" hash="28a3e301eba9589d3e2128b579135c57"/><file name="Tablerate.php" hash="f6cb70a26987f4d5bf21f4e14c2b3de0"/><file name="Taxclass.php" hash="c37c1f14b93f9f57cb015a36699c8e61"/></dir><dir name="Storage"><dir name="Media"><file name="Database.php" hash="a80225174c18c3d7236581d22cd47fbc"/><file name="Storage.php" hash="e2b63811fc79cd84bae23cdaa655895f"/></dir></dir><file name="Store.php" hash="8da77e59efb236dbd32a6bf404fd4b62"/><dir name="Tax"><dir name="Apply"><file name="On.php" hash="1da9f10687186974929b23f7cb7a72fd"/></dir><file name="Basedon.php" hash="039468a874c10dd3911e7229afda30c8"/><file name="Catalog.php" hash="dc709fc9ae1269bf4ff09c71a367cf1a"/></dir><dir name="Watermark"><file name="Position.php" hash="76e3b011648db676a29e3242ac9d94ef"/></dir><dir name="Web"><file name="Protocol.php" hash="712cee478a84fa431161999098ef9766"/><file name="Redirect.php" hash="95b100f80a9b9908bb7cc6a5e58e0e2b"/></dir><file name="Website.php" hash="fce2442cba397520c742ac3903cd4908"/><file name="Yesnocustom.php" hash="c341ffc353101f96ef9ecd1b0aa7c7ac"/><file name="Yesno.php" hash="1591a9f985f6a52cf878c47698fc9e91"/></dir></dir><file name="Store.php" hash="9bd64e79b131c8370f957199d0f8c5c1"/></dir><file name="Url.php" hash="f8bc5bc6abd0e70f060d8db0b5e0531e"/></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_Adminhtml.csv" hash="4424e8ffb616881242a4826f4abe9eea"/></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.7.0.1</min><max>1.8.0.0</max></package><package><name>Lib_Js_Calendar</name><channel>community</channel><min>1.51.1.1</min><max>1.52</max></package><package><name>Lib_Js_Ext</name><channel>community</channel><min>1.7.0.0</min><max>1.8.0.0</max></package><package><name>Lib_LinLibertineFont</name><channel>community</channel><min>2.8.14.1</min><max>2.9.0.0</max></package><package><name>Lib_Js_TinyMCE</name><channel>community</channel><min>3.4.7.0</min><max>3.5.0.0</max></package></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mage_Core_Adminhtml</name>
4
+ <version>1.8.0.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Magento Administration Panel</summary>
10
  <description>Magento Administration Panel</description>
11
+ <notes>1.8.0.0</notes>
12
  <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
+ <date>2013-09-24</date>
14
+ <time>09:09:43</time>
15
+ <contents><target name="magecore"><dir name="Mage"><dir name="Adminhtml"><dir name="Block"><file name="Abstract.php" hash="14cb362bffff27094d5d40a2f8d09c3d"/><dir name="Api"><file name="Buttons.php" hash="b88a052c3abd4c1f99763c8bd909b103"/><file name="Editroles.php" hash="97867ad74f00b1aef797f1433847c8e8"/><file name="Edituser.php" hash="4f93c75a7ec99b0b9499ad35a00fd72f"/><dir name="Grid"><file name="Role.php" hash="d096e114c2796b278a24e5f4569a68c9"/></dir><dir name="Role"><dir name="Grid"><file name="User.php" hash="93d8ad3b7a9e9a8d5ff641e2850b1a75"/></dir></dir><file name="Role.php" hash="15921497cd290df469b2685ac03d47e1"/><file name="Roles.php" hash="406b676e8251e7079ff309a205423bbb"/><dir name="Tab"><file name="Roleinfo.php" hash="43d6a8ec894b233ce09b70354ef7e9c7"/><file name="Rolesedit.php" hash="6609e636c5a2af464ef935bb26e8c0dc"/><file name="Rolesusers.php" hash="f9e75f281e23f4c624ee835f073e7ac6"/><file name="Userroles.php" hash="a0ba48a929493dd39f274a2d4cd94244"/></dir><dir name="User"><dir name="Edit"><file name="Form.php" hash="5c91a2e9761c9613379e22656628f4e1"/><dir name="Tab"><file name="Main.php" hash="4cb3bf33f7398181002643b44a214ffe"/><file name="Roles.php" hash="54734fb27a8191aeb0fdc40d9ae6a9fd"/></dir><file name="Tabs.php" hash="6b5f8af76b6cd621540cea52450b02c8"/></dir><file name="Edit.php" hash="e5140eb1a374c30379ea08cf4ab10413"/><file name="Grid.php" hash="513a97062650b07d5e210382f4c10371"/></dir><file name="User.php" hash="9222ec95b7b0bc69f81ba3f759fad714"/><file name="Users.php" hash="36bde29a13236084d6364435a92b5df7"/></dir><dir name="Backup"><file name="Dialogs.php" hash="6e6f3eaa99c455f3836e1ad514d22035"/><file name="Grid.php" hash="747b811a07a9939e51d81ee87a00049a"/></dir><file name="Backup.php" hash="b69dce7ad1c53e642978ae130bc9ef36"/><dir name="Cache"><file name="Additional.php" hash="c5bc97443fec7b8bbcf4a3e2c929df3a"/><file name="Grid.php" hash="bd1d000f2980b1ebe2d83e4762eb2663"/><file name="Notifications.php" hash="388dda202b693036eec27ce5011bcf93"/></dir><file name="Cache.php" hash="d86cbf0e7c22401890fd2b5bb1bec886"/><dir name="Catalog"><dir name="Category"><file name="Abstract.php" hash="1112e6e678d4acd89c0cf37b5b8827e5"/><dir name="Checkboxes"><file name="Tree.php" hash="ccf68799e117733b1e50f494f7597a5b"/></dir><dir name="Edit"><file name="Form.php" hash="b0d6dd61478207b22fad10316e4af4ef"/></dir><file name="Edit.php" hash="38630444c73e55fd5b48bf5c805a0790"/><dir name="Helper"><file name="Image.php" hash="d1b9196f793147820dda51209d872435"/><file name="Pricestep.php" hash="66671a52dcbe6a862942142fa03864b1"/><dir name="Sortby"><file name="Available.php" hash="ad9a6dcc65c192ee1d672328decf4605"/><file name="Default.php" hash="89255ca3c1dbfaf55c7406c1e8927e33"/></dir></dir><dir name="Tab"><file name="Attributes.php" hash="b9cdab71a46ac5b106dde1c7cd12f445"/><file name="Design.php" hash="7c3000ef4a17f72e168b8d0df7f65f0c"/><file name="General.php" hash="50b19c7cbd30d43eab9e6c21fb7ce74e"/><file name="Product.php" hash="b8c0e08335fac58a555ad9b28787eef6"/></dir><file name="Tabs.php" hash="9dcfca19cc9da6130cdf5f636a20c907"/><file name="Tree.php" hash="3cefd2f3f2937f152980ede00d0197c3"/><dir name="Widget"><file name="Chooser.php" hash="df9a1c81afe40ba929a49c19a624cfd3"/></dir></dir><dir name="Form"><dir name="Renderer"><dir name="Attribute"><file name="Urlkey.php" hash="c15687f8541d95b4af15ac8cbb426775"/></dir><dir name="Config"><file name="DateFieldsOrder.php" hash="47d8033c29a49cdec197f71726275793"/><file name="YearRange.php" hash="aa8920d86864f8cac6883482f598ad6e"/></dir><dir name="Fieldset"><file name="Element.php" hash="74abe367d87fbb50b6d8786cda57cc6d"/></dir></dir></dir><file name="Form.php" hash="742e963ac3ce2270b59eb5b0ae716bbe"/><dir name="Helper"><dir name="Form"><dir name="Wysiwyg"><file name="Content.php" hash="87fffa31b7e03c655c3903e26f14b02e"/></dir><file name="Wysiwyg.php" hash="cf81aea12fbc13652a1910e492a238c7"/></dir></dir><dir name="Product"><dir name="Attribute"><dir name="Edit"><file name="Form.php" hash="ccc4f15e4252623ae1d27b7b1d935910"/><dir name="Tab"><file name="Front.php" hash="f9c938a6bee0412f0e5af68171bf0022"/><file name="Main.php" hash="7bbb39a9fe16aaa888f4a62439164019"/><file name="Options.php" hash="3a0279d9246383f8c5e85b481fe4f9a7"/><file name="System.php" hash="5c5cb3c429d273cdc31c27f956d99bfc"/></dir><file name="Tabs.php" hash="4a69bc27f06b870c31f18c27cd75f18b"/></dir><file name="Edit.php" hash="22b444febe618045ab9af8dd9baa3b0d"/><file name="Grid.php" hash="ff8f4d30acfa2f309121dd68e5f167a1"/><dir name="New"><dir name="Product"><file name="Attributes.php" hash="d5381bcb99a6d22529dec268f81bd806"/><file name="Created.php" hash="a4344992672bf2b191d0cf384af94a8e"/></dir></dir><dir name="Set"><file name="Grid.php" hash="fc522805e635a05d80c491b23f621280"/><dir name="Main"><file name="Formattribute.php" hash="9ec94fcbdb0a7c92219d2521e4b708c0"/><file name="Formgroup.php" hash="37231d6065456106e3f7c8c2cf005aa7"/><file name="Formset.php" hash="1a65bb9afc6dcfd3da3bdbcb9c6f420d"/><dir name="Tree"><file name="Attribute.php" hash="b3408bf680934359ad61fb3a1ff03628"/><file name="Group.php" hash="8821cc1f50c9f329074418e0f3d314b1"/></dir></dir><file name="Main.php" hash="1f3f620ab1dc738cbad6cfb714bfa942"/><dir name="Toolbar"><file name="Add.php" hash="e753748a4339fc8ad2ceeae257adf75b"/><dir name="Main"><file name="Filter.php" hash="d298aca345319fedf1585992b7cc8d86"/></dir><file name="Main.php" hash="30e4186060e3a0b1dca3cf26946126a0"/></dir></dir></dir><file name="Attribute.php" hash="45bf06134deae7923f0a7f4533df0a12"/><dir name="Composite"><file name="Configure.php" hash="0784eb10c936a5414c51f529e51ff331"/><file name="Error.php" hash="945d29ecd1de125d6b4ea5fb0b341832"/><dir name="Fieldset"><file name="Configurable.php" hash="48daa4b8b1f69863e4fc83aa246de919"/><file name="Grouped.php" hash="465bcc1d31eb11821340656034408c67"/><file name="Options.php" hash="1b42181fbd64a1de3681389d43de1b38"/><file name="Qty.php" hash="ef10caf49eb55dfeaeacf8f369ad10cc"/></dir><file name="Fieldset.php" hash="6632839adb08b0e6c97de5cbb5de5eb5"/><dir name="Update"><file name="Result.php" hash="b09291d09fab7535574aacf4fa975b63"/></dir></dir><file name="Created.php" hash="259988d8e38f210e3140051a3d59770c"/><dir name="Edit"><dir name="Action"><dir name="Attribute"><dir name="Tab"><file name="Attributes.php" hash="e8b79b8dd9d2893fb19a8b92d8427dc0"/><file name="Inventory.php" hash="1337342385f31ffa5d22e05bb69e411f"/><file name="Websites.php" hash="0182de6100b35b7c0af00d0714dfae08"/></dir><file name="Tabs.php" hash="8f00ecefd9e0104595190f84c7d35787"/></dir><file name="Attribute.php" hash="bd5d105afcf566faaaa25c322d597cf4"/></dir><file name="Js.php" hash="44078b3f7313d60a30bf5dbdfa764dc7"/><dir name="Tab"><dir name="Ajax"><file name="Serializer.php" hash="1b450f5a5a5f5de1ffd2772791f84e17"/></dir><dir name="Alerts"><file name="Price.php" hash="b363ebcb98f6c5c055c2d1e58db64b82"/><file name="Stock.php" hash="f12d0c7736878e28e62c5808bf38ba79"/></dir><file name="Alerts.php" hash="beb1cf5e9f4ef73752a13ed9526f8447"/><dir name="Attributes"><file name="Create.php" hash="6b294d7a4a969d5c8b716fb7000d8d60"/></dir><file name="Attributes.php" hash="4fb21f67cb10a6cfc431534f52748d53"/><file name="Categories.php" hash="cdae4ae6e52fa305df433b8b10b82eb8"/><file name="Crosssell.php" hash="1a9c5d5023d1630a56a426288b88e85d"/><file name="Inventory.php" hash="4c6d52e12379280cd46c77dd1fe0ec2a"/><dir name="Options"><file name="Option.php" hash="a59987c123bae49aee8f0e6f3332d47c"/><dir name="Type"><file name="Abstract.php" hash="51859dac305b92c5fb12b552db46282c"/><file name="Date.php" hash="5670278435db055b5763011935588aa2"/><file name="File.php" hash="00c30b2d5d4aa7cc22b4e453afb875a2"/><file name="Select.php" hash="54867cdac0116e2c5a852653e69c8a7d"/><file name="Text.php" hash="7fb4f3b46adb5c0ec519533092e6dfce"/></dir></dir><file name="Options.php" hash="448dfbf24cd6fafe6a2a179eb10e2018"/><dir name="Price"><dir name="Group"><file name="Abstract.php" hash="9cdf699d4570a0c599f8f4f5e1aed799"/></dir><file name="Group.php" hash="c47f46dcb490443a27c17d7403bcd11f"/><file name="Recurring.php" hash="d0472610e4a387493e9c282942bdf6c8"/><file name="Tier.php" hash="a0a282f951884b0b0cf6e813babafb0c"/></dir><file name="Price.php" hash="46f7d20d3e4e00ebeb5228154792505a"/><file name="Related.php" hash="9d228c80b7489b17e448959f15995e47"/><file name="Reviews.php" hash="b8206b11a3a0a875f59c6383fdc4aaeb"/><file name="Settings.php" hash="49d758cf938b859a87ed88e5ca54cd8f"/><dir name="Super"><dir name="Config"><dir name="Grid"><dir name="Filter"><file name="Inventory.php" hash="ea7cb2f697e8c51beb285492e4a60042"/></dir><dir name="Renderer"><file name="Checkbox.php" hash="955bdd8ce67f3b232e3447e6e3f3f3d2"/><file name="Inventory.php" hash="5b6370ec0ac9682f4ad97eefb10c2524"/></dir></dir><file name="Grid.php" hash="e309831229afdbcf68a6425b476e27b0"/><file name="Simple.php" hash="cb24a075df9ee9c404c71a0cd2ade1ed"/></dir><file name="Config.php" hash="71ff33bcf600fb545d2f27b403cb65d0"/><file name="Group.php" hash="eb57b88bb5a7c09e7b27ccff1105810d"/><file name="Settings.php" hash="abf83b4fa8348b9d1ef470625594c3f6"/></dir><dir name="Tag"><file name="Customer.php" hash="ec07a085255ccdb45c03cc1e9a8dc0f7"/></dir><file name="Tag.php" hash="d02a5da8396370bbac019bdd2bd4e9b6"/><file name="Upsell.php" hash="4fee45193bcc93b46c25510740c938c0"/><file name="Websites.php" hash="8b853e86b29bde0c99811fda3f9a9c4e"/></dir><dir name="Tabs"><file name="Configurable.php" hash="efde18999697c318131f27ca5e572621"/><file name="Grouped.php" hash="7f3439a0ccf81b8a4e7f6ec8b726406b"/></dir><file name="Tabs.php" hash="e28787cb8d8978f351a5e0b5d1b2f022"/></dir><file name="Edit.php" hash="8e83a1b7acfb8fe35d08d9034e21a3e4"/><dir name="Frontend"><dir name="Product"><file name="Watermark.php" hash="62b7cb33879e04a77bebccad63ee525a"/></dir></dir><file name="Grid.php" hash="ede4059c6bca26c58e810c52b9ee18c1"/><dir name="Helper"><dir name="Form"><file name="Apply.php" hash="675987f1d38fce4cb9144c78f117ffa3"/><file name="Boolean.php" hash="c99d1aa6d355e685d184cc108557b80a"/><file name="Config.php" hash="d49b50ee5755e3074fac0f6537419876"/><dir name="Gallery"><file name="Content.php" hash="e1deba14a684451062484a3fae124f1c"/></dir><file name="Gallery.php" hash="fb13d3e1654c33048db19363ae5621a1"/><file name="Image.php" hash="b7a50470db78522f8872710e4af7ed4a"/><dir name="Msrp"><file name="Enabled.php" hash="b45025ff3d16c566cd664d2d9350fd4b"/><file name="Price.php" hash="f4c522fecdd1e565b6c9a87318346d03"/></dir><file name="Price.php" hash="73f7da319d1eb13badea41ddb5bf04de"/><file name="Weight.php" hash="7f39529754ca42688407b5ad0a4f4e80"/></dir></dir><file name="Price.php" hash="a4f2ee075e1086eacb613981e9ee2658"/><dir name="Widget"><dir name="Chooser"><file name="Container.php" hash="5fe5ff2288fed89d37647efe3b372864"/></dir><file name="Chooser.php" hash="c1de913e4d4b6e1a120cdcb349b3d112"/></dir></dir><file name="Product.php" hash="9f690c50a78f178ebf4344904c6c5a92"/><dir name="Search"><dir name="Edit"><file name="Form.php" hash="33ec365913b607598ff047c0f337f4c7"/></dir><file name="Edit.php" hash="c26b273a575cf62515e39ae8658faeea"/><file name="Grid.php" hash="0d2026341e706c5e2ff5fe9704525079"/></dir><file name="Search.php" hash="12fd8b56295b279a62e687ddc7f64747"/></dir><file name="Catalog.php" hash="2c8497e22f59c8e804a917d36d5ad977"/><dir name="Checkout"><dir name="Agreement"><dir name="Edit"><file name="Form.php" hash="2b0f1e7e7ff642107a4c64ced9c8cc92"/></dir><file name="Edit.php" hash="78ac4bd7b13e7d1ac2cf3cf6ad2b48e0"/><file name="Grid.php" hash="343a879d649448b08d4369068e9c448b"/></dir><file name="Agreement.php" hash="10d76b08239b43c3ef47c2e3c67c7335"/></dir><dir name="Cms"><dir name="Block"><dir name="Edit"><file name="Form.php" hash="ffaa5799e9992cc09fe4a678a1badb6c"/></dir><file name="Edit.php" hash="793afd1e9c8f8a6bb946ac6e2f16c767"/><file name="Grid.php" hash="1b5955a1894ae99cb97c9bd658140f83"/><dir name="Widget"><file name="Chooser.php" hash="c88cddd4fa1fc3a46d153b9d37dcb74a"/></dir></dir><file name="Block.php" hash="af60e48d124808aaecf583c807e93b39"/><dir name="Page"><dir name="Edit"><file name="Form.php" hash="0b9c963b53dec1b432ecd43bcce23c3c"/><dir name="Tab"><file name="Content.php" hash="4b23915762aae0ff0633ebb194ca7f9c"/><file name="Design.php" hash="b51f81b488a19c6e65251e2da8ffb313"/><file name="Main.php" hash="190ff9649974dfa81159753f5d0b8a2f"/><file name="Meta.php" hash="a1d981ba7dccdcffd177cd987cb970cf"/></dir><file name="Tabs.php" hash="3e9aa8e45f415ed28ecf1028fba18653"/></dir><file name="Edit.php" hash="da702114c7f9ada67916cc30d8bc9796"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="0d36fdbc56100784b74977ae73c1ed7b"/></dir></dir><file name="Grid.php" hash="f7beb17eba61dfcac691942ac274065f"/><dir name="Widget"><file name="Chooser.php" hash="4e703c779233062862a6ba7b9bcac700"/></dir></dir><file name="Page.php" hash="2be7d92a7dd5fddb99370eb9781983ed"/><dir name="Wysiwyg"><dir name="Images"><dir name="Content"><file name="Files.php" hash="357f07252b79a0c80a6e6b8f043a825b"/><file name="Newfolder.php" hash="cb6b50354a192e43e079f5af003b00cb"/><file name="Uploader.php" hash="a52b83fa44051cbda35ef49952cc1991"/></dir><file name="Content.php" hash="b72e8c3b9bee8f46fc7c609da85e669f"/><file name="Tree.php" hash="15810fd1150a4ecd88871b436fe003be"/></dir></dir></dir><dir name="Customer"><dir name="Edit"><file name="Form.php" hash="7163f1239491b5d5451802b0fe26e65e"/><dir name="Renderer"><dir name="Attribute"><file name="Group.php" hash="b4b59b9fbfc18e349200dfbae813caef"/></dir><file name="Newpass.php" hash="bebe934efbb0abdeec30ea5b4290dbe7"/><file name="Region.php" hash="8020a6171db9c85473d97d96d6c048b0"/></dir><dir name="Tab"><file name="Account.php" hash="3e460eb76c82c1a465032ca7d1da3fda"/><file name="Addresses.php" hash="be6930630b2d5837c611fef87f610fe6"/><file name="Cart.php" hash="a7a818f2d0793a6b429705411c8be7d0"/><file name="Carts.php" hash="d8473761d22e1c2d360d1d3e0973c7ca"/><dir name="Newsletter"><dir name="Grid"><dir name="Filter"><file name="Status.php" hash="403ec26afaaa5d2ee144c7cc2cb87a14"/></dir><dir name="Renderer"><file name="Action.php" hash="b4aa613945bfc4c6f8be7fcbfbbca3b8"/><file name="Status.php" hash="d4d1a2bf5984c09f1faf51688d89102c"/></dir></dir><file name="Grid.php" hash="6da41f1dffe7a8c1955cfcac60ad22a8"/></dir><file name="Newsletter.php" hash="40e1737f72103e67ea4cee7aa62d18aa"/><file name="Orders.php" hash="a7d5ae033fe46990f0719fd96dd9715a"/><file name="Reviews.php" hash="a31fc211d7c6d27d6dda801ea8d0892c"/><file name="Tag.php" hash="51dfc3e50fe857b5b2153c087a171037"/><file name="Tags.php" hash="1bfed4615b2a8f0baa64fe030cf449b9"/><dir name="View"><file name="Accordion.php" hash="2dd9b05b154cea0dabf30a5f6fa8c831"/><file name="Cart.php" hash="6282a3a2ee476d4014de5e24156a663f"/><dir name="Grid"><dir name="Renderer"><file name="Item.php" hash="c1e9329b6a726d92504914687d7171f7"/></dir></dir><file name="Orders.php" hash="e2c7bbdd3e924dae411da352a967b8fe"/><file name="Sales.php" hash="be7d50b2cfa68c5c94c969da9b987ac3"/><file name="Wishlist.php" hash="69e7fb0df89c410daab955f04dd70ac4"/></dir><file name="View.php" hash="d45cc800e0d29164b4a0568e5f200804"/><dir name="Wishlist"><dir name="Grid"><dir name="Renderer"><file name="Description.php" hash="02931c040a80d0bfe719763f648b7c35"/></dir></dir></dir><file name="Wishlist.php" hash="f50d5b09c0f38ba510fd71bc7e95fc0f"/></dir><file name="Tabs.php" hash="4d248cbcc82b95796dc2078b3753eb14"/></dir><file name="Edit.php" hash="a98f296115c00a2d59d033447709c2b4"/><dir name="Form"><dir name="Element"><file name="Boolean.php" hash="e6da8b6c3504197a3effe2beda8879d2"/><file name="File.php" hash="938a3345843258f90e74104a954bbfba"/><file name="Image.php" hash="9b88bca33c77eca116c7455e4bffba3e"/></dir></dir><dir name="Grid"><dir name="Filter"><file name="Country.php" hash="67f2cca4eca2212f80b7b84b7547554f"/></dir><dir name="Renderer"><file name="Multiaction.php" hash="de08e6cd2cf21b78a672ee44c10ede45"/></dir></dir><file name="Grid.php" hash="ca3a015399ffecab96d70572ca3d7525"/><dir name="Group"><dir name="Edit"><file name="Form.php" hash="163e3d6542ffc919a8e865660662fcc5"/></dir><file name="Edit.php" hash="9222090ba1539bd872593ba2dd4d7cbd"/><file name="Grid.php" hash="618135a3d0614fe00af29ea9c6f535d4"/></dir><file name="Group.php" hash="b3d390228b5508deae5e61d60754177f"/><dir name="Online"><file name="Filter.php" hash="0088b1768bb5e8f1f2a74877faaf7c22"/><dir name="Grid"><dir name="Renderer"><file name="Ip.php" hash="09be79e4961433db4d76d870ea0050d2"/><file name="Type.php" hash="b1b1f709d41bd6d2631be57870c6b4f5"/><file name="Url.php" hash="d92d55396ee11ac29c3637c4b82a96bd"/></dir></dir><file name="Grid.php" hash="8eb99587d67117a30190aad1b52eb311"/></dir><file name="Online.php" hash="121f09da47bec7e5cca6baa14965033f"/><dir name="Sales"><dir name="Order"><dir name="Address"><dir name="Form"><dir name="Renderer"><file name="Vat.php" hash="acba77ceb6bffe8c668bec145ba41943"/></dir></dir></dir></dir></dir><dir name="System"><dir name="Config"><file name="Validatevat.php" hash="f2ed3d595c50354946d6fcf41c71510e"/></dir></dir></dir><file name="Customer.php" hash="6d6d5e87baf467ebda1d267318f4074a"/><dir name="Dashboard"><file name="Abstract.php" hash="a36dc104c3400a56916452ce633c8011"/><file name="Bar.php" hash="1bf3a24629af068f059bb654b7c16eff"/><file name="Diagrams.php" hash="8d0f4c71ae0d2856f145967e2f156fe2"/><file name="Graph.php" hash="8c30fa033cec29ca79d7e79be16b3fa5"/><file name="Grid.php" hash="23aa358c30bc8a6edc36f50986105326"/><file name="Grids.php" hash="24c947c6d70ac5d5f985812ee77bc0bc"/><dir name="Orders"><file name="Grid.php" hash="4ecd91c21006047b8e8c4e92c7238917"/></dir><file name="Sales.php" hash="8fb1120b5b3176865377f2b1d7a00eb3"/><dir name="Searches"><file name="Last.php" hash="3e640538917ea8de44bb76e921a7a0e6"/><dir name="Renderer"><file name="Searchquery.php" hash="a4bf4f1c263a580a0466e0393ed8ed47"/></dir><file name="Top.php" hash="387cb6d3a30fe9e8d369f37b285b2e4f"/></dir><dir name="Tab"><file name="Amounts.php" hash="b06bead5a575bf0f36e2bb2b6b357d74"/><dir name="Customers"><file name="Most.php" hash="51e07baa4e78d9698b59f787df2a9c77"/><file name="Newest.php" hash="2b1dc0a542b5e9f17fd735ea431b43f2"/></dir><file name="Orders.php" hash="ce4d338a75a4396cda3f888be5769d3b"/><dir name="Products"><file name="Ordered.php" hash="cb34feff3a85b39efbad6503d5d0fb36"/><file name="Viewed.php" hash="de39b81a7a7e0f15cbac7d45af9704ef"/></dir></dir><file name="Totals.php" hash="06af3a4eb34ee58e2e0abc8de2d06289"/></dir><file name="Dashboard.php" hash="fb6b29885f8fff4dbb214a25477ce539"/><file name="Denied.php" hash="4fec62f2e6a8058c7a07517e690fd3f9"/><dir name="Html"><file name="Date.php" hash="2f84ad9b99a205a4dc15529cc2e21fe6"/><file name="Select.php" hash="ecbfc8969ba69152c6342e336a10b9a3"/></dir><dir name="Media"><file name="Editor.php" hash="bd8c864a18d0f0132127b40697fb8f94"/><file name="Uploader.php" hash="200c48716d2a34619e43284c37fc6da2"/></dir><file name="Messages.php" hash="0a29c702e281b4de7df1a038a51e390d"/><dir name="Newsletter"><dir name="Problem"><dir name="Grid"><dir name="Filter"><file name="Checkbox.php" hash="da7f694ce51e4916dce9d89a630f7760"/></dir><dir name="Renderer"><file name="Checkbox.php" hash="db05e0b64ade0c37fa1163716280a8a1"/></dir></dir><file name="Grid.php" hash="94396e38a63eab9a9f5b099c80dc140c"/></dir><file name="Problem.php" hash="7e5060913521778cc8c400cca198d340"/><dir name="Queue"><dir name="Edit"><file name="Form.php" hash="2f6f7944479d267334d71681db0236fd"/></dir><file name="Edit.php" hash="7413b36133d3e06137ef8081c44003e2"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="63d1ff52a759c3051c7689af81597cd3"/></dir></dir><file name="Grid.php" hash="3a950bf2f862429fb7fa344c4c087c32"/><dir name="Preview"><file name="Form.php" hash="ea77143e1acf70d5459077bdd3cb1f38"/></dir><file name="Preview.php" hash="4a9e6415bef952f6effc01e1ea9d31ec"/></dir><file name="Queue.php" hash="3dd36b863c30121aa8608fa56b168766"/><dir name="Subscriber"><dir name="Grid"><dir name="Filter"><file name="Checkbox.php" hash="4b6e4ed38f3882ea8c1fe70e67dc784f"/><file name="Website.php" hash="0794bd7ebe6eb00347879b7591b72fca"/></dir><dir name="Renderer"><file name="Checkbox.php" hash="ed639b27a8fe8f7caa01a5b3045610ba"/></dir></dir><file name="Grid.php" hash="264b5ae7ca64abb48adb9372cce5e5ba"/></dir><file name="Subscriber.php" hash="413e7c5740af2647c7d87fb16a7cafd6"/><dir name="Template"><dir name="Edit"><file name="Form.php" hash="c2502e6ee49d578b7379052b1449100c"/></dir><file name="Edit.php" hash="0ea688d39e042db79823133dfc34d57d"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="f05d436b05872aca71a056957c40214a"/><file name="Sender.php" hash="10094ac7718d48e6082caa3a03f8eeac"/></dir></dir><file name="Grid.php" hash="151e05ba5fd9d782b48f2880680be89c"/><dir name="Preview"><file name="Form.php" hash="c50956932c646bbcce873b5277a499c2"/></dir><file name="Preview.php" hash="de8aed06b3b9d7f84e0baceffb859c8d"/></dir><file name="Template.php" hash="4e87e1680cedec541ab20ee5097d3f8c"/></dir><dir name="Notification"><file name="Baseurl.php" hash="ed669430401d7e99a76ebdea2d73af7e"/><dir name="Grid"><dir name="Renderer"><file name="Actions.php" hash="cdbe2a01a1f5dc1404f5096e9629d56c"/><file name="Notice.php" hash="db7c7cc37eae9ed2b51dc64d67f7ee1d"/><file name="Severity.php" hash="8cd84e7f55f25abf0615cdb11713f080"/></dir></dir><file name="Grid.php" hash="7e2906df85f9450a4eff595818f25936"/><file name="Inbox.php" hash="efd6fffbc059667116257e5123da7118"/><file name="Security.php" hash="2a2844968b92349f6db64fa9829b368c"/><file name="Survey.php" hash="4404541e27c4531b80e4a6982b01fd1b"/><file name="Toolbar.php" hash="97abf0069682d6f2930ad6b483701268"/><file name="Window.php" hash="5b9bae6b0d0c261f2bff366c5de8adaa"/></dir><dir name="Page"><file name="Footer.php" hash="e392f1aaa1f61ef43c1e2a4882bf18e6"/><file name="Header.php" hash="431f28c73ae1725bb285fdabfa14bb01"/><file name="Head.php" hash="9aaff3c4e142619ea3043b0ab9313103"/><file name="Menu.php" hash="42ca2782f613336e4d9dc269ea507610"/><file name="Notices.php" hash="96ecf97e216c865366373fc875a90f76"/></dir><file name="Page.php" hash="9e0b034ec13fee581c4383158e6b2fe3"/><dir name="Permissions"><file name="Buttons.php" hash="ecf2014403ac043ab4e75d8a5ce13d6a"/><file name="Editroles.php" hash="c52b46cb6826770ad1cd86552f9436e2"/><file name="Edituser.php" hash="c63a0e2f336a34b719ee7f8e98a43d95"/><dir name="Grid"><file name="Role.php" hash="18a8e32ef7e8756bc53985ba71c7b305"/><file name="User.php" hash="9f00f22ea0dee6457b551365c406152d"/></dir><dir name="Role"><dir name="Grid"><file name="User.php" hash="29d2961cd85be771217b13c6d7994b65"/></dir></dir><file name="Role.php" hash="71d68b364bce13cec8b07b45ed2b45d9"/><file name="Roles.php" hash="40ca7b6cfd4a0b8b52ac350b2f993b3f"/><dir name="Tab"><file name="Roleinfo.php" hash="fb6a692dde5a500b36deef24a309ff40"/><file name="Rolesedit.php" hash="ae1797aa3103efc14a19cf0ca606a23e"/><file name="Rolesusers.php" hash="bcd8644fcacefd8d63d781ed95237d4a"/><file name="Useredit.php" hash="16da77fc23483aa3727cbac8194ed705"/><file name="Userroles.php" hash="b25a1526b328eaec65b56d5d066f0734"/></dir><dir name="User"><dir name="Edit"><file name="Form.php" hash="14a72b79040e7c96a7d78861fca48a26"/><dir name="Tab"><file name="Main.php" hash="9b02a7d52f4fa832ed9397a87887c7a0"/><file name="Roles.php" hash="0c6a68836763efd4a3567223b5264465"/></dir><file name="Tabs.php" hash="594015aafd5b4c43e1ef38355638c6f0"/></dir><file name="Edit.php" hash="62c908fad037ac02689ab4a1fa8f3fed"/><file name="Grid.php" hash="96782741949a6b5b71107615eaa399fa"/></dir><file name="Usernroles.php" hash="d10a1612394b106e1e162a985939a54b"/><file name="User.php" hash="075580423ad9317288648f46d8e4dbcb"/><file name="Users.php" hash="aa22bace6247915ed3bef9df1f7ee6d7"/></dir><dir name="Poll"><dir name="Answer"><dir name="Edit"><file name="Form.php" hash="9a540c458f849f9f8a1c5f1216d1bb1f"/></dir><file name="Edit.php" hash="564f062fd0538a86e6742d7f49e90708"/></dir><dir name="Edit"><file name="Form.php" hash="978eb9aadd8408502eeb89864ae875f3"/><dir name="Tab"><dir name="Answers"><file name="Form.php" hash="1bc8dffb03fda161ecfe02202c622cae"/><file name="Grid.php" hash="ea340816c6505d1172142d666d39315e"/><file name="List.php" hash="2e854f8f725b372e57318eaa57ff59ae"/></dir><file name="Answers.php" hash="926e09cf27de1291fb95c1bf7fb5df68"/><file name="Form.php" hash="68ff275b1fa52e7c40ae19dc51d0d10e"/></dir><file name="Tabs.php" hash="57dbf9318b9d695bf14d679b88c89933"/></dir><file name="Edit.php" hash="db220c4c513edc1a1a71077b057db253"/><file name="Grid.php" hash="085dd44aed93cd1a4e6cd25d26be1169"/><file name="Poll.php" hash="02b909547f48814624ecd10b3c791813"/></dir><dir name="Promo"><dir name="Catalog"><dir name="Edit"><file name="Form.php" hash="ef420b8b7a63d7c63b1cfb03424568c8"/><file name="Js.php" hash="d864a4d0feee20c815e861a1d5ae0824"/><dir name="Tab"><file name="Actions.php" hash="07b9a6ed88b76faf7bfc797ee3058082"/><file name="Conditions.php" hash="5520f7fad26b32c9b43ef61c9cf3e553"/><file name="Main.php" hash="ce0c35fe91b7076ba845589ecd91e1eb"/></dir><file name="Tabs.php" hash="b66c0a1928f4651a9b217752cb636e6c"/></dir><file name="Edit.php" hash="74730b4f241f98c6cd42e15d72ea3d03"/><file name="Grid.php" hash="efa2ad1c81ad569a40f3ef5f745f39c3"/></dir><file name="Catalog.php" hash="57bfb7a27d987bc2628e21f915fe0f07"/><dir name="Quote"><dir name="Edit"><file name="Form.php" hash="f6864f70badbad2ee38fd7491d1825d4"/><dir name="Tab"><file name="Actions.php" hash="9aa7da2f6c5a1c8b4b20b2df422cb045"/><file name="Conditions.php" hash="7fb38c723f410065058f53dd057d1833"/><dir name="Coupons"><file name="Form.php" hash="546d893cf82faa870f8b25846e43979a"/><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Used.php" hash="88cfb7fe30734b3db14196cc441bc6f8"/></dir></dir></dir><file name="Grid.php" hash="19787770d519f7ef91a403265f00e8cd"/></dir><file name="Coupons.php" hash="ea2aa8ed16ab2ebafdeee8bf410f3756"/><file name="Labels.php" hash="977dd120bf6ac8e6b01e5e5b3c1e75c2"/><dir name="Main"><dir name="Renderer"><file name="Checkbox.php" hash="20dc7c993a2adbd905b1527d92334cce"/></dir></dir><file name="Main.php" hash="96e4d03680f8db8f6667ab834c145bf6"/></dir><file name="Tabs.php" hash="69dccedaa48caaed4d06a61a3c9698a7"/></dir><file name="Edit.php" hash="5b3b3f86eb275bb4ff32d6d1444d58ab"/><file name="Grid.php" hash="35dd1fc3dd29c441d2cb51910474ea39"/></dir><file name="Quote.php" hash="97971c68e20338d3a3a24e6a81fb0e95"/><dir name="Widget"><dir name="Chooser"><file name="Daterange.php" hash="577c34b3b1339bfdffcfd0f782758bea"/><file name="Sku.php" hash="94889cdaae2a6fb79c5058c085518d53"/></dir><file name="Chooser.php" hash="1f009ebd37b1a62cfbc9e63a82c53f90"/></dir></dir><dir name="Rating"><dir name="Edit"><file name="Form.php" hash="430121d5ed0eb10ae6323f10f16ecf1e"/><dir name="Tab"><file name="Form.php" hash="1f5e43627940d5b893d13471a5e9bbec"/><file name="Options.php" hash="090a7dd0e0ab742e8c18552089b5245c"/></dir><file name="Tabs.php" hash="e256cb896c3f975e06eb3696e660494f"/></dir><file name="Edit.php" hash="01298c0d33ea52ef7f18335126dbcb30"/><file name="Grid.php" hash="70acebd0de58b5abc2feb70c14469152"/><file name="Rating.php" hash="fde8997d4eef64d0e505bead4b2b859d"/></dir><dir name="Report"><dir name="Config"><dir name="Form"><dir name="Field"><file name="MtdStart.php" hash="44f27dfadbdc65aca58662c9cfbd7bf4"/><file name="YtdStart.php" hash="f181c04a401a981abb3f76c9fd097c32"/></dir></dir></dir><dir name="Customer"><dir name="Accounts"><file name="Grid.php" hash="3f003382d54451bbebe9b17749264b12"/></dir><file name="Accounts.php" hash="c7a860194ab322bfee42156f03bfff5b"/><dir name="Orders"><file name="Grid.php" hash="1d927e20db8ee28c68d86acc16d97244"/></dir><file name="Orders.php" hash="e1f3092b2e08fbcfff3d338c64da6c8c"/><dir name="Totals"><file name="Grid.php" hash="fa9ca8d598493c86c3c324d905bdbce3"/></dir><file name="Totals.php" hash="40d2ce448285c3838a799137c3399bbb"/></dir><dir name="Filter"><file name="Form.php" hash="62fe6c9667c81dd6b5fa51eae4bd0f08"/></dir><dir name="Grid"><file name="Abstract.php" hash="95bbf048dd79b7d3e44045aa902c082f"/><dir name="Column"><dir name="Renderer"><file name="Blanknumber.php" hash="debf137c7adf1b62ae716c6251aa5bf4"/><file name="Currency.php" hash="cc408af6e96cfd241bdb43420a2371a8"/><file name="Customer.php" hash="4cd1282a9ccadf4b947c7e8db0a64a28"/><file name="Product.php" hash="a61575514229da9c22908bb27a310b28"/></dir></dir><file name="Shopcart.php" hash="bd3c7a8b5dcc1d829649b711b9a63773"/></dir><file name="Grid.php" hash="7ef17e39ad8115cdd6c43308325b63c5"/><dir name="Product"><dir name="Downloads"><file name="Grid.php" hash="f67179386a2798d4996045d16e0cb4ba"/><dir name="Renderer"><file name="Purchases.php" hash="1179574d3f272078af71e89a16d54cc4"/></dir></dir><file name="Downloads.php" hash="5cffca76e018bf7b11db69a951357466"/><file name="Grid.php" hash="e191dd17a1f14c390f58749ae5cf070f"/><dir name="Lowstock"><file name="Grid.php" hash="6778017c010cc9f79e9c7c53a94408bd"/></dir><file name="Lowstock.php" hash="164ba3126eb226f26c1f712873a8af2d"/><dir name="Ordered"><file name="Grid.php" hash="3ce0dac7257356f978152453db5d04f5"/></dir><file name="Ordered.php" hash="3017610110ea5d7621cf2bdcf9db81e4"/><dir name="Sold"><file name="Grid.php" hash="8516b82102d49da16fb6947cdb1171f8"/></dir><file name="Sold.php" hash="3c30831e84f811ae84963156cf9953bf"/><dir name="Viewed"><file name="Grid.php" hash="181ed980ec96072f52dcb775c45e894c"/></dir><file name="Viewed.php" hash="272d6ed097974db758c389d082a53286"/></dir><file name="Product.php" hash="8fd09b2628eebb2c354f0ba16d49ba91"/><dir name="Refresh"><dir name="Statistics"><file name="Grid.php" hash="e8f4227a66117f0659fbcb39129dac09"/></dir><file name="Statistics.php" hash="404ba5b889697e4781275ead89beb1c5"/></dir><dir name="Review"><dir name="Customer"><file name="Grid.php" hash="32847c1a51df06bd55da6ef8038ee2d2"/></dir><file name="Customer.php" hash="a1c8daf984a870daa61e93b303c9c971"/><dir name="Detail"><file name="Grid.php" hash="96798ccd432c60de49e952e38e1255a4"/></dir><file name="Detail.php" hash="e1079aa0c7fc23917efeca7bfbf92772"/><dir name="Product"><file name="Grid.php" hash="bcd96fb23bb3a46b79c95e402c103250"/></dir><file name="Product.php" hash="9c96863d2ecac7b97bb51c9e690d2a6f"/></dir><dir name="Sales"><dir name="Bestsellers"><file name="Grid.php" hash="6da7947e5d4bbdc3231b5dfa4fa384c5"/></dir><file name="Bestsellers.php" hash="0eb48b01584454b645bc85910d8252b9"/><dir name="Coupons"><file name="Grid.php" hash="133ba4ace7598339ae336379dc2c43e7"/></dir><file name="Coupons.php" hash="409bb4ff9e83b09666c8d756c488dc5c"/><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Date.php" hash="927cb353a3528ebe1db09dd7e51eaa9a"/></dir></dir></dir><dir name="Invoiced"><file name="Grid.php" hash="d0e8ebb2a05b444ed91756fd8ed7bc2b"/></dir><file name="Invoiced.php" hash="51bdc596c652873d82e5e005f21af65b"/><dir name="Refunded"><file name="Grid.php" hash="892eec6453923f4526bc462c115a3d19"/></dir><file name="Refunded.php" hash="8eabd6bd8495ad2e64114cbd9891785a"/><dir name="Sales"><file name="Grid.php" hash="7bd6cd702f50888d1685568b62fab707"/></dir><file name="Sales.php" hash="77bb1a42e11aa46700544e036b1d35ea"/><dir name="Shipping"><file name="Grid.php" hash="dd774bbb4a3458afb40e8eb5fd651e87"/></dir><file name="Shipping.php" hash="0c86a66f6f87f69bc64b9e813284be78"/><dir name="Tax"><file name="Grid.php" hash="4c324ae338298c65c06c62500ace762a"/></dir><file name="Tax.php" hash="201b9e0e1c7a3a4edfe65b1d901189be"/></dir><dir name="Search"><file name="Grid.php" hash="c26ec785a1e350bc1450daba4d538f46"/></dir><file name="Search.php" hash="07be064721f7ac978c1fb1c299dbe9c2"/><dir name="Shopcart"><dir name="Abandoned"><file name="Grid.php" hash="bd4ae49600d0efabda1b0ebffba3286d"/></dir><file name="Abandoned.php" hash="ca00120c7eada02d16024e7f1e05c177"/><dir name="Customer"><file name="Grid.php" hash="26c05e5cd6278f90715aab8bc23a3007"/></dir><file name="Customer.php" hash="600f168aec42adaf952c192262bd0920"/><dir name="Product"><file name="Grid.php" hash="dd226d7e189873c0eaa730a1c87ebf26"/></dir><file name="Product.php" hash="e028e99a7aaa222caf3c55083b66ae4a"/></dir><dir name="Tag"><dir name="Customer"><dir name="Detail"><file name="Grid.php" hash="b974045ed1560194cca1b14e49910dad"/></dir><file name="Detail.php" hash="5dd18c4c984e8381b50d8fc8c1e8c4af"/><file name="Grid.php" hash="bf553cc6bf6b62b750417f3675054164"/></dir><file name="Customer.php" hash="12750f521d729ffff5b8f4a20e5644b4"/><dir name="Popular"><dir name="Detail"><file name="Grid.php" hash="b8ca4e406bb5a7f0270b5373e67aefba"/></dir><file name="Detail.php" hash="3de19477e41a514f30d8f55b6ead9fa9"/><file name="Grid.php" hash="c9c3f36fff6025b39c2f1e6901264573"/></dir><file name="Popular.php" hash="174f00f41bbb895ff51a475d0fb992de"/><dir name="Product"><dir name="Detail"><file name="Grid.php" hash="621974317f3703a2bdeace084c90e9e3"/></dir><file name="Detail.php" hash="b1441fe912c951295154d9049d2041ea"/><file name="Grid.php" hash="470b8a360f3c3a12cc39a5448784480e"/></dir><file name="Product.php" hash="9f42acb7cdb9ff5570366531d4eda76f"/></dir><dir name="Wishlist"><file name="Grid.php" hash="ca98a205f7bf889357ed448f8c34f0dc"/></dir><file name="Wishlist.php" hash="a7bf6cbea34d3b466756318bfa3663c1"/></dir><dir name="Review"><dir name="Add"><file name="Form.php" hash="bf4e0963b93994a4ea31225b22edf2c6"/></dir><file name="Add.php" hash="16b8c9cdde11db0ab72b892f8f7606f4"/><dir name="Edit"><file name="Form.php" hash="3f5074f9bcd6082953ab1b68c101c3e3"/></dir><file name="Edit.php" hash="aea02cddaad078ee62058f77f4ffb6b7"/><dir name="Grid"><dir name="Filter"><file name="Type.php" hash="387b73dcecb38a4a347eecb07e448585"/></dir><dir name="Renderer"><file name="Type.php" hash="84dc97e3885d4df68b35ef7a3abe9001"/></dir></dir><file name="Grid.php" hash="cb254d7bce58d7990f13b2e238526b27"/><file name="Main.php" hash="1579e82e9a27cfd2cc5caa5ca4e8de88"/><dir name="Product"><file name="Grid.php" hash="1a9447b2465999bc2223ad9485dd5694"/></dir><dir name="Rating"><file name="Detailed.php" hash="2b5c4e709af8ed1df7c57b5b962b576e"/><file name="Summary.php" hash="6186544ce23c9584688a93246db67316"/></dir></dir><dir name="Sales"><dir name="Creditmemo"><file name="Grid.php" hash="dc61484b0588009d332f7c4a3b800841"/></dir><file name="Creditmemo.php" hash="ffe836b370a615ea01397bddf01f11c5"/><dir name="Invoice"><file name="Grid.php" hash="656819e8fc696410454cd0f2a4c1b409"/></dir><file name="Invoice.php" hash="5975815d6b56700822ca0e12d5454f57"/><dir name="Items"><file name="Abstract.php" hash="d570fa035c4cdf8d63f81524b5e9e083"/><dir name="Column"><file name="Default.php" hash="61ea8aa52392cec5de9f33798ce295a6"/><dir name="Name"><file name="Grouped.php" hash="3d87444eed40e68d9ad189d409b3e4ee"/></dir><file name="Name.php" hash="974129ef40a57fed70f53680b7078ec5"/><file name="Qty.php" hash="ccac172ac7e2d81cc96b85708dc5c49e"/></dir><dir name="Renderer"><file name="Configurable.php" hash="9ea19d9bee45a483ceac6f0699e9b06b"/><file name="Default.php" hash="ccc7a9994a62c6021a8156ad86df9c4b"/></dir></dir><dir name="Order"><file name="Abstract.php" hash="ec2c96e71b4c4de477b9ed9da8edd7a6"/><dir name="Address"><file name="Form.php" hash="32b4be23563bdaa58134cf578996c43a"/></dir><file name="Address.php" hash="0779f4b970daf3e147cba8d0910db5a4"/><dir name="Comments"><file name="View.php" hash="14c698dc1e4d42ae70690fe753ea8e4d"/></dir><dir name="Create"><file name="Abstract.php" hash="74ae162e8cee0a7cc92d17cf8d56866d"/><dir name="Billing"><file name="Address.php" hash="22283077b3d10f5c472899b3de3f1249"/><dir name="Method"><file name="Form.php" hash="ab8b309840407ffe9d962f5cfc6f53b1"/></dir><file name="Method.php" hash="93a8d7566b24d082cfdd094ae2474501"/></dir><file name="Comment.php" hash="dca3b9934829f4e888de3f6d94c2aa6d"/><dir name="Coupons"><file name="Form.php" hash="1fca56321fc5ab2dfd60170963d5885d"/></dir><file name="Coupons.php" hash="9e2a86f46919a8e1d2109dcf554c2259"/><dir name="Customer"><file name="Grid.php" hash="572a672850a0ef6fa457391bab514069"/></dir><file name="Customer.php" hash="126e1e675d3e0e55fa1534d8d80bb158"/><file name="Data.php" hash="14a6a084c95e113d4970f9b692c95bc5"/><dir name="Form"><file name="Abstract.php" hash="54111d57141c005fdc6c8e47eaa719d4"/><file name="Account.php" hash="3edb9d85ee53623af6a9afd2404cee9a"/><file name="Address.php" hash="b8741a14578949121e888b29c4135e6f"/></dir><file name="Form.php" hash="f4a35158033fff56c9b91a202b0c3f77"/><dir name="Giftmessage"><file name="Form.php" hash="dfcb7a46124ef3f2a84ecfdd34c71c91"/></dir><file name="Giftmessage.php" hash="da0a10fc1e8ebf61ecf6fe99620b8b26"/><file name="Header.php" hash="87958e201a91352c465236f683f6797c"/><dir name="Items"><file name="Grid.php" hash="c3db64f8a23244765fa8e747c084e578"/></dir><file name="Items.php" hash="0c1a43756a7fabdc6d58f7b6ebf4274e"/><file name="Load.php" hash="c33d51c647b7dfb331b40d2e9555ced5"/><file name="Messages.php" hash="d49f5057d43621acf58652e7987df918"/><dir name="Newsletter"><file name="Form.php" hash="7fafc7311e15204f092a3cac1f727ae1"/></dir><file name="Newsletter.php" hash="db41296072cbc669f9a818c18aad274b"/><dir name="Search"><dir name="Grid"><dir name="Renderer"><file name="Giftmessage.php" hash="b5065591ca844c05b6cb2ea66d0c8293"/><file name="Price.php" hash="5c3a94df24c5ff39ba28924886894fda"/><file name="Product.php" hash="392ca6ca4bdba0a557b00b7347513bc2"/><file name="Qty.php" hash="9785a0f427454b315212dc5457d960d1"/></dir></dir><file name="Grid.php" hash="84d400c7a85e3f7507616331a068f476"/></dir><file name="Search.php" hash="9ac6c1aa7e483ff674b29da4035a51b5"/><dir name="Shipping"><file name="Address.php" hash="61400acd6e41214eec61928b912d65a6"/><dir name="Method"><file name="Form.php" hash="f4c5754c60e197e9cc569d507f99d72f"/></dir><file name="Method.php" hash="b429f731ec978249ae7ffd8e59a5ed7f"/></dir><dir name="Sidebar"><file name="Abstract.php" hash="1b6f499476d6103436872cc550d2eaa2"/><file name="Cart.php" hash="02139a25c44fec341ff2eae5fe520219"/><file name="Compared.php" hash="de3024f552a88e1879ee74fe87eb9dd0"/><file name="Pcompared.php" hash="513db20edddcc2200739b54255216f9d"/><file name="Pviewed.php" hash="0e04980589a260ca2b1062aeafb9d194"/><file name="Reorder.php" hash="bf5aba74de2816b4618f0b7951ca7f30"/><file name="Viewed.php" hash="22c4239f794de4257defa80782c8ce40"/><file name="Wishlist.php" hash="51450a4b61f032579233b5d27a8cc272"/></dir><file name="Sidebar.php" hash="15b49562996b9b039eeac76a9cff81c2"/><dir name="Store"><file name="Select.php" hash="bfe4f1e4cba4137f0d0fa3152fa55d37"/></dir><file name="Store.php" hash="bb350449eab4b7a3ffcfa2fa0fb2da5a"/><dir name="Totals"><file name="Default.php" hash="b94afd742cf2c094240182a43d775ce6"/><file name="Discount.php" hash="2b50452d43af4d9de68c3550a37ed68a"/><file name="Grandtotal.php" hash="7d16fa944c1967492cc4082c6909cedb"/><file name="Shipping.php" hash="3f8657fc5c427d3e061131abe15b1e5b"/><file name="Subtotal.php" hash="b15890486227f4f8ce001286da22a4e4"/><file name="Table.php" hash="ebfd101bb8eca71b3606a9c2f0c2e82e"/><file name="Tax.php" hash="a26e7b4283cdc06537268e5ffda2607b"/></dir><file name="Totals.php" hash="05edfdd8711a652b5e5142ae4225388f"/></dir><file name="Create.php" hash="877f5054baadce4991768863343425f2"/><dir name="Creditmemo"><dir name="Create"><file name="Adjustments.php" hash="3b75b612da964c93ca9e0debb5875174"/><file name="Form.php" hash="b4e307769236c78e31b1d9ed6c6d7370"/><file name="Items.php" hash="3dd0fdc8c89a4933d3634d0aa8b4a992"/></dir><file name="Create.php" hash="74f4760b643b3d8f3c09b4a9c646a499"/><file name="Totals.php" hash="a9495571f47fb4e8e5d2a56f6769f22e"/><dir name="View"><file name="Comments.php" hash="caa3c8b88ee140d67f0d685a8aa88c98"/><file name="Form.php" hash="df301b49df326116ffb73b44a645a598"/><file name="Items.php" hash="46dfc949f036509879cba13dd87f57c6"/></dir><file name="View.php" hash="2026006cc97994480ec9473cffd35ff6"/></dir><file name="Grid.php" hash="61a4cec7446fc8d71b1dd86118738f9f"/><dir name="Invoice"><dir name="Create"><file name="Form.php" hash="bff70cce5ab6a54d83e804585ba89c39"/><file name="Items.php" hash="8c7655890c21ec11e4f0bb1684cf6449"/><file name="Tracking.php" hash="c5580d9bb29137a58aa3d5b9c0c7d42f"/></dir><file name="Create.php" hash="ddd2c9a11e35256f84cabb7e77409b62"/><file name="Totals.php" hash="d6ecac385c53c66d50d93c26794142ea"/><dir name="View"><file name="Comments.php" hash="31507034121df9afd8c2b646b4e6ed37"/><file name="Form.php" hash="d1d49356e7816a7dcf47527047ce3586"/><file name="Items.php" hash="baf269b2293f4b73b2c6bb093bb1a604"/></dir><file name="View.php" hash="eb6070e356348f4f8c480ab32784f19a"/></dir><file name="Payment.php" hash="68de123264c2bb2913ef6cc2b7458fc1"/><dir name="Shipment"><dir name="Create"><file name="Form.php" hash="7d39ccdcd23bf1620e8d7a4040864742"/><file name="Items.php" hash="5a6781a034e4357b3e8c7baceb860498"/><file name="Tracking.php" hash="3a9cbabe93c8199b6875dae459458c79"/></dir><file name="Create.php" hash="2a6b77e5e41be0f008e6a7be50ff43ac"/><dir name="Packaging"><file name="Grid.php" hash="1122801249db45983e439d2184cad4a5"/></dir><file name="Packaging.php" hash="eca49fd770f11107b68b759bded1abf5"/><dir name="Tracking"><file name="Info.php" hash="4c1c9120054a59438250ea221cb01ca8"/></dir><dir name="View"><file name="Comments.php" hash="8a15344a9b5d886409f08b46288bc2d1"/><file name="Form.php" hash="7257cfbb71101ad0deb7e40d97150999"/><file name="Items.php" hash="f5f890b726951384772112a729566029"/><file name="Tracking.php" hash="4dbcd29f5bfc80ed06ca12df15c7ec46"/></dir><file name="View.php" hash="22e74725c79838f580e11d0f6cab1f5d"/></dir><dir name="Status"><dir name="Assign"><file name="Form.php" hash="ccfb44485437a53f80ae4342b3a52e3b"/></dir><file name="Assign.php" hash="bc065040c3bef24cfaf98d39c61a7060"/><dir name="Edit"><file name="Form.php" hash="485d3db49d79b1598b2864401a3b53e2"/></dir><file name="Edit.php" hash="2a67a4d2e31b79cd1ebb2d5edc34c35a"/><file name="Grid.php" hash="3575a1a06a0dfc29cf0573a48287916b"/><dir name="New"><file name="Form.php" hash="756999ffd438e2bcd2d1dbf802048e2d"/></dir><file name="New.php" hash="189284878ab4ad3fd5bf45f9bfe85b06"/></dir><file name="Status.php" hash="ddc0a661f02c854bba3963b476b6a011"/><file name="Totalbar.php" hash="d5387ee3f481eb0a9fa94e33f44adadb"/><dir name="Totals"><file name="Item.php" hash="c42d13f149e316dc87a8773b1ab020cc"/><file name="Tax.php" hash="193dd7fb0c216706c63c00768383d0e0"/></dir><file name="Totals.php" hash="0086df18a48e9494f041024b8862ecae"/><dir name="View"><file name="Form.php" hash="21c65ef7813259def8b8ebff5aba9138"/><file name="Giftmessage.php" hash="d975b54fd78f7190927188f238310977"/><file name="History.php" hash="0f7d3ebda74b3b93c5aae03f7b68ea2b"/><file name="Info.php" hash="3c39d3bab29827dfbf156955a9a89c05"/><dir name="Items"><dir name="Renderer"><file name="Default.php" hash="7b165f0bf36757ec989ce939771484d4"/></dir></dir><file name="Items.php" hash="9616fabdbd3aef41dc936cfda0a3e44e"/><file name="Messages.php" hash="df16c071516d176dd562aa8ab9811132"/><dir name="Tab"><file name="Creditmemos.php" hash="a4ac2eda83c00ecadfe92ed0affdfe25"/><file name="History.php" hash="83bcbedc3834f0667114eedad60adca6"/><file name="Info.php" hash="bee5dd720fbedb805eb8b4c5f3f9a643"/><file name="Invoices.php" hash="c71df05848f4c2b4d3badf3517d28bfb"/><file name="Shipments.php" hash="a9f7b5f9ae62b09c40b02503cf3df391"/><file name="Transactions.php" hash="d8e6d40ce09acd50075f154568c3d9e6"/></dir><file name="Tabs.php" hash="ff134b80984fd3f4659b3e8defb7b889"/></dir><file name="View.php" hash="8328b940ecd7827d05cc2a1c520fc372"/></dir><file name="Order.php" hash="8f79dadc6952acd640988b5056e769c1"/><dir name="Reorder"><dir name="Renderer"><file name="Action.php" hash="f61432c0aae12bde34d3217b760b8979"/></dir></dir><dir name="Shipment"><file name="Grid.php" hash="234c145d5b84642ebbfb19aa980e5810"/></dir><file name="Shipment.php" hash="a732151690df6da90dead1bf094b0541"/><file name="Totals.php" hash="2d5e88b5201ee57f7853a66f60e60d8b"/><dir name="Transactions"><dir name="Child"><file name="Grid.php" hash="a1f6b53c090c9264beb8e21def4c1384"/></dir><dir name="Detail"><file name="Grid.php" hash="5355b2a8b49d22f9f4241da40f9cd32b"/></dir><file name="Detail.php" hash="d3561017f86fb542c85f42b96e7c7d4d"/><file name="Grid.php" hash="e33628560f021a4459c2767f5db92112"/></dir><file name="Transactions.php" hash="77b62bbb585b281d3787973efcfd4259"/></dir><file name="Sales.php" hash="358f5e19c76f75f8508e08dbbad7007f"/><dir name="Shipping"><dir name="Carrier"><dir name="Tablerate"><file name="Grid.php" hash="35eaaebb42b61d4bbf9a59042e8404c8"/></dir></dir></dir><dir name="Sitemap"><dir name="Edit"><file name="Form.php" hash="2854bee962e3b9e9e20e8e41f89b6e12"/></dir><file name="Edit.php" hash="9b911253680077f4f34ccbde7aca2861"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="4b5f1379762971b29c2ec75a0a61807c"/><file name="Link.php" hash="c2d737275e4a75b75cf95e02eae39288"/><file name="Time.php" hash="bd2953078214ddeca384e844cdfd124a"/></dir></dir><file name="Grid.php" hash="6ea041ce2e32a3dd33fe821af7915b32"/></dir><file name="Sitemap.php" hash="d250d04cd3e80762998839cc37fc149c"/><dir name="Store"><dir name="Switcher"><dir name="Form"><dir name="Renderer"><dir name="Fieldset"><file name="Element.php" hash="ec646aef0e422b97de57008fe9a75f7c"/></dir><file name="Fieldset.php" hash="49379e33d4881ce32553e0dbe8d55b05"/></dir></dir></dir><file name="Switcher.php" hash="84bd47070917a33b9cc6e8c892ae01bd"/></dir><dir name="System"><dir name="Account"><dir name="Edit"><file name="Form.php" hash="ddccb6c88d84af45c623c511f2dcb44a"/></dir><file name="Edit.php" hash="d8dd0f9b978baabcb90652f8936235ba"/></dir><dir name="Cache"><file name="Edit.php" hash="630b9bbc66915705886476fa25f74b4c"/><file name="Form.php" hash="06344dd249f05f2c5e396d6a2ddcec5b"/></dir><dir name="Config"><file name="Dwstree.php" hash="61cf3485186d02128d078ba7b90bdfe1"/><file name="Edit.php" hash="75c383cf92c973718200d0b9716ba93f"/><dir name="Form"><dir name="Field"><dir name="Array"><file name="Abstract.php" hash="4e1f7b0165d18b34c903ab6f2aed6821"/></dir><file name="Datetime.php" hash="a423c05c7a5dae1514d649bf012af581"/><file name="Export.php" hash="0dc1a515631a57ec70805df6849d29ee"/><file name="File.php" hash="c83352c3aa973adf77cc9704abc35e4b"/><file name="Heading.php" hash="eaa165a4f20d7bca565ae797bd88efbb"/><file name="Image.php" hash="af252eb046916be7a50fbc47168b4839"/><file name="Import.php" hash="7ba70bbf225858238a3fecc3f78b544e"/><file name="Notification.php" hash="9090787cab58913816cd49b4e099b5d3"/><file name="Regexceptions.php" hash="68ee2ae38e9c6e82bf0061f5ab52bbbe"/><dir name="Select"><file name="Allowspecific.php" hash="33ee4a2188fb0e5687d0d98a41768fe7"/><file name="Flatcatalog.php" hash="65f3813a3ef3794f88abb4321a7c0c48"/><file name="Flatproduct.php" hash="9a4676e6655fa12298b30c8264cfb41e"/></dir></dir><file name="Field.php" hash="ef2603567f5da732fdbae9c82e0cef03"/><dir name="Fieldset"><dir name="Modules"><file name="DisableOutput.php" hash="2cf27298c5ad07fbd6ebafdf1a4dae13"/></dir><dir name="Order"><file name="Statuses.php" hash="1691d8b45b3e3ec9f6d8b7794e9b6cae"/></dir></dir><file name="Fieldset.php" hash="a2d9e48719d127539d96082d8a8b4490"/></dir><file name="Form.php" hash="da889a27baeb5ef9198682eeffc73a68"/><file name="Switcher.php" hash="5494a491d8176bc571ac7e53d9f86261"/><dir name="System"><dir name="Storage"><dir name="Media"><file name="Synchronize.php" hash="acdf1c0133e57f6db36e961bb204e4ef"/></dir></dir></dir><file name="Tabs.php" hash="4b861023efd9b83492302be2f5b25de9"/></dir><dir name="Convert"><dir name="Gui"><dir name="Edit"><file name="Form.php" hash="b7bda9dcbe61d810994b58a7d8d29c49"/><dir name="Tab"><file name="Upload.php" hash="c5b176ae1a905666fedc96bd36cca857"/><file name="View.php" hash="822318577616588146d5e6a59ce1b632"/><file name="Wizard.php" hash="8badd54921f747ea85b06244cf11d861"/></dir><file name="Tabs.php" hash="07c10d61e013b4bb7e7925db43f680ab"/></dir><file name="Edit.php" hash="f3a5e98a5a43082725c942be20916fc8"/><file name="Grid.php" hash="018cd347d41f0a9eb9bd029c6a987825"/></dir><file name="Gui.php" hash="3906c646051d78b72021a76c14aff173"/><dir name="Profile"><dir name="Edit"><dir name="Filter"><file name="Action.php" hash="b8a37a8186f25a270143b14757dc5e72"/></dir><file name="Form.php" hash="3694af72af22ca40ddc5c7c83ace7d22"/><dir name="Renderer"><file name="Action.php" hash="638f92c2fd37833bbf01d815ddaf17b7"/></dir><dir name="Tab"><file name="Edit.php" hash="6f7457d1ff0fdc7641d45e81a168b124"/><file name="History.php" hash="c6efd7ca8c34ebd138a051ada7666586"/><file name="Run.php" hash="0eb5ebf1d2dd17f5e7fd3d697a1a48cf"/></dir><file name="Tabs.php" hash="e293ec12fc8e25073737c049bb647122"/></dir><file name="Edit.php" hash="49b37bd1c9c798637f324b04e24b13ed"/><file name="Grid.php" hash="58aeab2a1473ea7356d5322eb7c64a11"/><file name="Run.php" hash="f3ccb0381da6e38990880be27e8b8925"/></dir><file name="Profile.php" hash="c93fdb3c066ce2b9946b24863ab8c197"/></dir><dir name="Currency"><dir name="Edit"><file name="Form.php" hash="3c92834e9dd3a8f026c1bad90b0b71a6"/><dir name="Tab"><file name="Main.php" hash="22954e10e2aae7a7a3aab3181955b887"/><file name="Rates.php" hash="f325044ce396fe08780b5989cbf80745"/></dir><file name="Tabs.php" hash="1188422957863ed1e9463710ff73c6d5"/></dir><dir name="Rate"><file name="Matrix.php" hash="36764666ad710f9a33890beb567b8df0"/><file name="Services.php" hash="f9770c48561ec29b207c5fa97ff425db"/></dir></dir><file name="Currency.php" hash="4817d79131d14541fef9d75450a9d9b9"/><dir name="Design"><dir name="Edit"><dir name="Tab"><file name="General.php" hash="58c447ee8977cec3598a47ade7206464"/></dir><file name="Tabs.php" hash="33a9e8fe3d29f35ae5567551a8a769f0"/></dir><file name="Edit.php" hash="d593e84aef95c95bfb2d8e06bf6a0e34"/><file name="Grid.php" hash="98c96d732e2323b629bca3be406dc285"/></dir><file name="Design.php" hash="9b0dc56ab7dc9c17f78b0b0784ca2a7c"/><dir name="Email"><dir name="Template"><dir name="Edit"><file name="Form.php" hash="78c55e5de0ddd340f87e9d2f7fb6c693"/></dir><file name="Edit.php" hash="a809018608ff3a4764bbe61b3e2b1989"/><dir name="Grid"><dir name="Filter"><file name="Type.php" hash="320095e4873cb25b6c27e08c66c601a9"/></dir><dir name="Renderer"><file name="Action.php" hash="daead924a364b4970f67c38e9ee3939c"/><file name="Sender.php" hash="65b7b2b11dafebaae01be28cf6cc8d19"/><file name="Type.php" hash="36397fc14119ca57375cf3295579bc9b"/></dir></dir><file name="Grid.php" hash="02b4ea9ef2e48a37b1daa3fd4566f3a3"/><file name="Preview.php" hash="97dcd17cafe97fe98b7dacc12b0c7fe3"/></dir><file name="Template.php" hash="fd5c789dfef5f117f9bde21a929c0e65"/></dir><dir name="Store"><dir name="Delete"><file name="Form.php" hash="ad804555f02e82cd2f5987223d391297"/><file name="Group.php" hash="187341ff388195eb76a0a1762fd29865"/><file name="Website.php" hash="97202e675e85c88e59a8f21706e73a13"/></dir><file name="Delete.php" hash="68721974bb804f94eea65284846a4623"/><dir name="Edit"><file name="Form.php" hash="bbd2fd5a01db0b83cb1a3c8408b2f928"/></dir><file name="Edit.php" hash="19bbece1a9051a52f73958d6cc44bd61"/><dir name="Grid"><dir name="Render"><file name="Group.php" hash="a57a91f11924d381e8b06d0788155d5d"/><file name="Store.php" hash="660546f1ba9cfbaf3629ea6520a6cb91"/><file name="Website.php" hash="2f316c84ad8f016ed7b3c22c4948390d"/></dir></dir><file name="Grid.php" hash="4f35467eb7d04b98dd0eb4dae69efa5e"/><file name="Store.php" hash="5d097ae9579b26b1085696490fe1b32a"/></dir><dir name="Variable"><dir name="Edit"><file name="Form.php" hash="189bf98ee9d32aceaa34945715a4d97d"/></dir><file name="Edit.php" hash="2ef0ee3aab94be340d99cd756178ba22"/><file name="Grid.php" hash="ae79e80557ea72e1962d64e8d6ac1366"/></dir><file name="Variable.php" hash="22ffd92cfe537f85db91cc187cfc937e"/></dir><dir name="Tag"><dir name="Assigned"><file name="Grid.php" hash="262395a487d3f7ac507f6b06645c64b7"/></dir><dir name="Customer"><file name="Grid.php" hash="cdbe009dd128a2bcd56c9a0c182dec05"/></dir><file name="Customer.php" hash="e7851969a3ab6c75738a851750df4106"/><dir name="Edit"><file name="Accordion.php" hash="5a8325f5532f9907d3760e37b549edab"/><file name="Assigned.php" hash="ba3f13448771ca6601c6590b295cd086"/><file name="Form.php" hash="a1bc371fc437a77db046608f49a66b33"/></dir><file name="Edit.php" hash="926a1c11b55a81ef96b64721bc12cc0b"/><dir name="Grid"><file name="All.php" hash="890803b30098d8fe753d0d3218864f35"/><file name="Customers.php" hash="eacde2cd0e12d59f1e8722533b09581f"/><file name="Pending.php" hash="279b4b7ab758abd80a63716e178f22b2"/><file name="Products.php" hash="bf7a26134368853c24e5dec098d1d4e3"/></dir><file name="Pending.php" hash="f778cc501f1c760a775cd7eb1ea39d08"/><dir name="Product"><file name="Grid.php" hash="b409865d955963c939811a294d39739d"/></dir><file name="Product.php" hash="fe7e9a0d935c77fa09af56e4715b03fc"/><dir name="Store"><file name="Switcher.php" hash="55e0ff589d171fe58186e61da96c3b82"/></dir><dir name="Tag"><dir name="Edit"><file name="Form.php" hash="dd20a8c7f77f8314c2fc2e9a5fe49852"/></dir><file name="Edit.php" hash="5a5ead13178fd076d1cd9e5978592092"/><file name="Grid.php" hash="a1f47bb9aac9221c2e15ee2a2cf851dc"/></dir><file name="Tag.php" hash="4678ce75018fe4b62f4add4a60f5984e"/></dir><file name="Tag.php" hash="b4250808c5eb762658a12044166f6279"/><dir name="Tax"><dir name="Class"><dir name="Edit"><file name="Form.php" hash="24255303a1912cb300b4baf3ec42974a"/></dir><file name="Edit.php" hash="1f61ceaf1830a1e5c95d5aa962117194"/><file name="Grid.php" hash="01663b0fd59fa591dbc97feaa1dc34c0"/></dir><file name="Class.php" hash="87b324633ef3be76a7c80643c972ff34"/><dir name="Rate"><file name="Form.php" hash="70da9e1865f9175127f812372a07e790"/><dir name="Grid"><dir name="Renderer"><file name="Country.php" hash="3e81c3816f0967f960134ccef70f54cf"/><file name="Data.php" hash="57b6050de5b66b66fd71b5e859adb99b"/></dir></dir><file name="Grid.php" hash="f4bc5d1f4e2053b01fc29cf19a9d4742"/><file name="ImportExport.php" hash="6f9ee869e72cdd12fdd8c339c84ebf76"/><dir name="Title"><file name="Fieldset.php" hash="e88c086dbd03c3fc2bf49eba58cb51c2"/></dir><file name="Title.php" hash="b14c33d6c4eb3e29576b0230c2d2003a"/><dir name="Toolbar"><file name="Add.php" hash="17d4fee12cdc093fef720a85e430bcb1"/><file name="Save.php" hash="4993895140e075506dbca66ab2d2511b"/></dir></dir><dir name="Rule"><dir name="Edit"><file name="Form.php" hash="b4a45f1cd91a2bf5ec66c54e938a5979"/></dir><file name="Edit.php" hash="f098612c60c106c7ad3e1a60b4dd30c0"/><file name="Grid.php" hash="40f407ae8f3aaf8efe3f1d7317a06837"/></dir><file name="Rule.php" hash="ffb863d9f8d16baf2e577a0bfb5b7082"/></dir><file name="Template.php" hash="4dd0e902ac10071214bef7a28bb98af3"/><dir name="Text"><file name="List.php" hash="b6c9d4d2fff4129a1bd8cb511f8cb904"/></dir><dir name="Urlrewrite"><dir name="Category"><file name="Tree.php" hash="fa67719ac38a8fdb0542eb480e180839"/></dir><dir name="Edit"><file name="Form.php" hash="b20d4a8b28c2c5de23d72c5d3c660bc9"/></dir><file name="Edit.php" hash="3f40b0906145e893c8343e7993bdeac2"/><file name="Grid.php" hash="c8f8161d9621414a8a43032c930cebf1"/><file name="Link.php" hash="f08633ff8c568810e608e659b6c06003"/><dir name="Product"><file name="Grid.php" hash="411121e2f3c07e76fd433a58da852eb4"/></dir><file name="Selector.php" hash="b1b01a7f0c62b3be33bb850e19f7e31e"/></dir><file name="Urlrewrite.php" hash="dc559873b7552bc0fda08de7fa4abe38"/><dir name="Widget"><dir name="Accordion"><file name="Item.php" hash="6b58d4d76483dd9b7b863811474f342c"/></dir><file name="Accordion.php" hash="0eab591ae6ba8b0a06b05d6e3c261a5a"/><file name="Breadcrumbs.php" hash="0fd744f39a7eb5172822c70901931f98"/><file name="Button.php" hash="155d4b66796fddf105302cf16b870c43"/><file name="Container.php" hash="2413ce89359b559eb085829c27266092"/><dir name="Form"><file name="Container.php" hash="e0122e68119ad1a0f5da9097e59ea39f"/><dir name="Element"><file name="Dependence.php" hash="45cdfa039cb621525225dbbd68d8d2e4"/><file name="Gallery.php" hash="45ee8119965fcb57b8073b933e3d0d99"/></dir><file name="Element.php" hash="258128802e370e43a153352bf106c03f"/><dir name="Renderer"><file name="Element.php" hash="6949759fa3ca9e45577a61402458dc68"/><dir name="Fieldset"><file name="Element.php" hash="fe5faccf4487000daa5385d45ae229b0"/></dir><file name="Fieldset.php" hash="436daed1f5a9ca5b29feacade9f960c1"/></dir></dir><file name="Form.php" hash="1c4c40c8694351592664f605ea96429d"/><dir name="Grid"><file name="Block.php" hash="ff6e2dfbb4227ea6b9238bdbdd8552a0"/><dir name="Column"><dir name="Filter"><file name="Abstract.php" hash="0cebe4fc6aad7f61590b9881b2ac89bc"/><file name="Checkbox.php" hash="61cc780e91dbcb48b39e5161b094da44"/><file name="Country.php" hash="f65c07fa36d513421a0239c05ebdd1b3"/><file name="Date.php" hash="807f7c8f6727823886f2d0c153a25c51"/><file name="Datetime.php" hash="f1b480d9c3a6d7bb74e2f52ef1a55af8"/><file name="Interface.php" hash="56c239edde3c3de6c92e887ad61f7166"/><file name="Massaction.php" hash="c372fc3ce9e2fbcd12e2ed13d5513f51"/><file name="Price.php" hash="2f344bc359d47aaf5b942048bb2c8f9a"/><file name="Radio.php" hash="e63b2168fda1b749e84bfa26dd19a5a2"/><file name="Range.php" hash="cc0074d8cad4820f0e590892e1dcc73b"/><file name="Select.php" hash="b45f339f95dfacf8d4a72dfede4674a6"/><file name="Store.php" hash="1361dc52620fb9950bfb5d1a533c49b9"/><file name="Text.php" hash="d5aac85a05b584b39e488f2c56f143e4"/><file name="Theme.php" hash="14d8cc304489af9bda62b61b44b6c881"/></dir><dir name="Renderer"><file name="Abstract.php" hash="8071d47fe61369ab03cb30dfc9615fe4"/><file name="Action.php" hash="0c92eec9fb6af714c83e411a031d2b58"/><file name="Checkbox.php" hash="a9ac9dcbcff71919755e45a33f0618b8"/><file name="Concat.php" hash="b2c2bec4f98b9c98430dba83f31b32f4"/><file name="Country.php" hash="fd0598714e3124e43b2bb361bd2fe22e"/><file name="Currency.php" hash="cfeae94739fff049453c2e84e80c7e7d"/><file name="Date.php" hash="1dd03b0df3e2ab3fd74df96aeff60f71"/><file name="Datetime.php" hash="427b1930cd06b20bbb9fd5e3a3c02841"/><file name="Input.php" hash="6fab4f8f4584b082a86ca95749d8f79e"/><file name="Interface.php" hash="ea1f36c3051cee7dc52ee49703698bf8"/><file name="Ip.php" hash="f73383e45f92babe678fd44b5b095ad3"/><file name="Longtext.php" hash="7a8fd3b7135190ec675f1f510765a416"/><file name="Massaction.php" hash="f6035b737df2aa2290f641d1adeb7aee"/><file name="Number.php" hash="d52c5fea7b3861b76d3387add42289f7"/><file name="Options.php" hash="84144f05bbaf987578fe18cda34afa4d"/><file name="Price.php" hash="ac1e9032f003921b06aec655dc0e612f"/><file name="Radio.php" hash="da70c1bfda67c98651fe866923649b3e"/><file name="Select.php" hash="57b462763e2c9dd3ca3b16f1838cd733"/><file name="Store.php" hash="0370b51504c3047221c5fee90862eff1"/><file name="Text.php" hash="3314430d7ab112c6e5574ab6a955fc0a"/><file name="Theme.php" hash="0762a4162f2c0b9c3451678f0dff8e54"/><file name="Wrapline.php" hash="07ff85eb753ba17294ef561325dc60d1"/></dir></dir><file name="Column.php" hash="cdeb777b461a422b8a0d06b9612a4cc0"/><file name="Container.php" hash="9e54a2951f538c5139f1092b57ff77ba"/><dir name="Massaction"><file name="Abstract.php" hash="ba0b70af51d74a2ef74fc9f389681ef8"/><dir name="Item"><dir name="Additional"><file name="Default.php" hash="6dbeb432da25149d2f2aa059290cd0d2"/><file name="Interface.php" hash="616f28b116cd4bea9cf27f146c6cbab9"/></dir></dir><file name="Item.php" hash="f780b960e96f4c34c97bd39022e15873"/></dir><file name="Massaction.php" hash="f5aff40aaa61a328abff52f168c7e45a"/><file name="Serializer.php" hash="da9cfdd58247ac453cab384813cb8b5a"/></dir><file name="Grid.php" hash="e23c2b9c0c82a893b426f5911e86a8f8"/><dir name="Tab"><file name="Interface.php" hash="0fb2855258dfe855e95c8221912d8e5b"/></dir><file name="Tabs.php" hash="346d2f6095b8fb3b86b6a6f73fec97ef"/><file name="Tree.php" hash="4ce65e63aaa2bf80fd8f8e842e5dfec7"/><dir name="View"><file name="Container.php" hash="e574a3de99c054135ee6e7fd855d8c6e"/></dir></dir><file name="Widget.php" hash="b53a98a37df81cd59a22d46e1378b2a7"/></dir><dir name="Controller"><file name="Action.php" hash="bf94219e482724386c4434de145575a6"/><dir name="Report"><file name="Abstract.php" hash="59c681a4c331f3a7c68929ebbc8ab01c"/></dir><dir name="Sales"><file name="Creditmemo.php" hash="e8ad721be046e9f225e049b6875d6605"/><file name="Invoice.php" hash="8fe8aee9073c653cf2e553a53f9ed4a1"/><file name="Shipment.php" hash="cff59c4f838e240235869a2a8d7a34d9"/></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="3f015c5b40909f77c4f7eddc1022ca02"/><dir name="Api"><file name="RoleController.php" hash="6e52ef593ffd51bbeb98c0c6a5a2fb10"/><file name="UserController.php" hash="be4782c8750ca0bafd8e25fe57bc5a5e"/></dir><file name="CacheController.php" hash="f2414644d2e1e986473b689643e39551"/><dir name="Catalog"><dir name="Category"><file name="WidgetController.php" hash="f792b9c468c9d233b8cac2b508434c9c"/></dir><file name="CategoryController.php" hash="e76265ef3d5d6479c0f2965ae418d826"/><dir name="Product"><dir name="Action"><file name="AttributeController.php" hash="61cecb68b01f81a2ffb0eb862e8c4f98"/></dir><file name="AttributeController.php" hash="937bb3acb5b40220f61052acb4ba8dee"/><file name="DatafeedsController.php" hash="5e2b970bb08715347c9f6ce8bae734ef"/><file name="GalleryController.php" hash="06a55db29a85974a392bd8fea4dbd70f"/><file name="GroupController.php" hash="262351333569872d619c149eab13693c"/><file name="ReviewController.php" hash="6f50de1b34410db3b1fa24ec849c4750"/><file name="SetController.php" hash="65c0b6fd63d8f0cdc859dfeea0f04e24"/><file name="WidgetController.php" hash="64b2c72183ae7a649eced8b6643c274f"/></dir><file name="ProductController.php" hash="c52e83c8d0448a1f54da7fd8f037f7c9"/><file name="SearchController.php" hash="814026941f5070a30371ca3858a8fb5b"/></dir><file name="CatalogController.php" hash="ef55e0acdb1e1ed84e9db0419cc93d3b"/><dir name="Checkout"><file name="AgreementController.php" hash="47acc47c5901feeda4fb84db37e5fd21"/></dir><dir name="Cms"><dir name="Block"><file name="WidgetController.php" hash="32b37f11ef7b49951c61a420aba4edb1"/></dir><file name="BlockController.php" hash="9984ff7cb60a08e239d1516e776bdf27"/><dir name="Page"><file name="WidgetController.php" hash="2a39dc54a3d48af94df11664cb9366e7"/></dir><file name="PageController.php" hash="96640c497ad01a4aa9e238e3de3beb71"/><dir name="Wysiwyg"><file name="ImagesController.php" hash="ae007ff21751f8e507dfecd4ff178192"/></dir><file name="WysiwygController.php" hash="3116b058088206d28a814dc00daa8e35"/></dir><dir name="Customer"><dir name="Cart"><dir name="Product"><dir name="Composite"><file name="CartController.php" hash="839f4c8314ed3acf32450850a6b5c2fa"/></dir></dir></dir><file name="ConfigController.php" hash="7e00ffaaaa1a612292f0c494a402501e"/><file name="GroupController.php" hash="01288a334cb45a01e419eb2a06648e21"/><file name="OnlineController.php" hash="21036192b71c5744727ccce2044df0dd"/><dir name="System"><dir name="Config"><file name="ValidatevatController.php" hash="c9f4c9efcee0651240c859345c2fbebe"/></dir></dir><dir name="Wishlist"><dir name="Product"><dir name="Composite"><file name="WishlistController.php" hash="bbc5fdb7b811a7da63a70154f1dd27d2"/></dir></dir></dir></dir><file name="CustomerController.php" hash="1fdf362cdf72876544607ffd9cc99726"/><file name="DashboardController.php" hash="bf77cba89919434d31126f5e1577f4a2"/><file name="IndexController.php" hash="9426d51906bd904978760682cad794e9"/><file name="JsonController.php" hash="fb1dd09071491cbccde5bc3d5742ee24"/><dir name="Media"><file name="EditorController.php" hash="7f684964c721a24ae1be2e345a766c5f"/><file name="UploaderController.php" hash="a640d0fa8a2e6acf7b2e9500f2cade4d"/></dir><dir name="Newsletter"><file name="ProblemController.php" hash="fff6adbd0bcefbdab32d30981297dd4b"/><file name="QueueController.php" hash="d343633feeedd3d9bad5cdd699c38d78"/><file name="SubscriberController.php" hash="0ee8d4f82926baad2b9e6fe5f0060ecb"/><file name="TemplateController.php" hash="e81a0ea6442ec5edf902b15cf6fb33e9"/></dir><file name="NotificationController.php" hash="cdef5ab915cb9c66bf471878dd0a7a74"/><dir name="Permissions"><file name="RoleController.php" hash="7955143a4ebac8fbe75dd43ad333f176"/><file name="UserController.php" hash="db4848a25ec547511465a6333244fbcf"/></dir><dir name="Poll"><file name="AnswerController.php" hash="cd4f27973bb30db4da8177446bb79527"/></dir><file name="PollController.php" hash="c6918546920a1e4d7cf8597caece5e35"/><dir name="Promo"><file name="CatalogController.php" hash="8492c48930cdc7a42e94f1c8462e7f91"/><file name="QuoteController.php" hash="57158c39c845b844539e62a545d849d9"/><file name="WidgetController.php" hash="271212e499c1ea7f57cd20703a988f2a"/></dir><file name="PromoController.php" hash="ba362e93f841c52849f329183b4512bc"/><file name="RatingController.php" hash="b86decc2995d12b2e5a867e5e7668e2b"/><dir name="Report"><file name="CustomerController.php" hash="ec608e21a92d9da9d7ab412e8f20c694"/><file name="ProductController.php" hash="e937797e8d8796677f44a2a68f61b59a"/><file name="ReviewController.php" hash="e87b929a7a02e9671b495e0dc6206228"/><file name="SalesController.php" hash="1786ea33faf2e4a929b73cfc2595e476"/><file name="ShopcartController.php" hash="658f089c6f66b3f8e88a3fef9c34ca83"/><file name="StatisticsController.php" hash="d121c1ac7639508fce83b192748fc3b5"/><file name="TagController.php" hash="784e31c5eefb07ed713e0b3d207dddf8"/></dir><file name="ReportController.php" hash="3868d26148c9e969eb306454d5e029f8"/><dir name="Rss"><file name="CatalogController.php" hash="d01cc915d43dd5eb3aedd0ed060873c0"/><file name="OrderController.php" hash="619d3de2d334cb897ed6622c5e871609"/></dir><dir name="Sales"><dir name="Billing"><file name="AgreementController.php" hash="52a3eec0309cc05d340ea327fe260493"/></dir><file name="CreditmemoController.php" hash="03bfd7bb5d837ae96243635fd8b956aa"/><file name="InvoiceController.php" hash="65ccced3c2d242e8de9bcb3c59f9598b"/><dir name="Order"><file name="CreateController.php" hash="f2769391812d1a906b318cd1f5654207"/><file name="CreditmemoController.php" hash="88d652a02108d577f749d89d90932158"/><file name="EditController.php" hash="cfa6e31341e6c7db8b8a348eb0e7a083"/><file name="InvoiceController.php" hash="4a36dfcf0a59e434a5719d6d9430ea1e"/><file name="ShipmentController.php" hash="3117f9ea1f80fda8668645c240f45805"/><file name="StatusController.php" hash="1b4f0d40a53e6afafd7048c17cda2318"/><dir name="View"><file name="GiftmessageController.php" hash="6e9719551a250f5d0a796a4a988c378f"/></dir></dir><file name="OrderController.php" hash="abeca3291ece2395b121e4a53c63aacb"/><dir name="Recurring"><file name="ProfileController.php" hash="25711f1ddcfde83d78bb074911df3ef2"/></dir><file name="ShipmentController.php" hash="30f07910ca5c04373e7496bcc8d7d440"/><file name="TransactionsController.php" hash="973cce2907a88a2c0fdfad5f6d454142"/></dir><file name="SalesController.php" hash="9ea67bd3f2fcd75cda0d656f3da1a7e7"/><file name="SitemapController.php" hash="4a853a5f2c54b4b4c7191df500e5b31a"/><file name="SurveyController.php" hash="d6984b6f6c10ca865b6a6963b77b33e8"/><dir name="System"><file name="AccountController.php" hash="1197e4221ac01d38c279597d569b91c5"/><file name="BackupController.php" hash="63ee579686f94da34bf3078b173b8a4f"/><file name="CacheController.php" hash="c33a3b7f5a903ede232647b67e04335e"/><dir name="Config"><dir name="System"><file name="StorageController.php" hash="660ab768b6aa4b428882626126821513"/></dir></dir><file name="ConfigController.php" hash="c1a43ca018972512842ea4bc9a5f91d5"/><dir name="Convert"><file name="GuiController.php" hash="38a6f916eb98e58bef098b457c0c7b87"/><file name="ProfileController.php" hash="de71275d584f5983e23f060f2093e64a"/></dir><file name="CurrencyController.php" hash="b1836d91c88596d3aafae9d4257f3068"/><file name="DesignController.php" hash="93f93e9e90bcd5e950c5af76b3342908"/><dir name="Email"><file name="TemplateController.php" hash="d75f095b2f971a01a988ab76932a4e2c"/></dir><file name="StoreController.php" hash="6931072b6d6884e57dbc5e721ffe28df"/><file name="VariableController.php" hash="56d3e318f274aaae94f518be06a19c8c"/></dir><file name="SystemController.php" hash="4ba17965739f4e86b0383d00de990983"/><file name="TagController.php" hash="80f6963468f63dafe9b68fc5dad8e9b9"/><dir name="Tax"><dir name="Class"><file name="CustomerController.php" hash="654a769edf513cb30615d213821275d3"/><file name="ProductController.php" hash="06b424dcad41488eef5641ca55b04ef4"/></dir><file name="ClassController.php" hash="1c696f4a38e3fed2869f88cf85420ae0"/><file name="RateController.php" hash="1d7436a2c82ef4a085d1a8359998bb0c"/><file name="RuleController.php" hash="466c278e887fd4e8dc2e7c367a2e7fee"/></dir><file name="TaxController.php" hash="ace9a98440056b57e57fb9526520d5d2"/><file name="UrlrewriteController.php" hash="98b094e70c4a8fd4bf8cea3580614f97"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0037556b319726d0efead1ad7a1d6cf0"/><file name="config.xml" hash="4159a8c8ea39c5134f9c9271081063a1"/><file name="jstranslator.xml" hash="28ff351540a20a45c4ae734f91d4cb23"/></dir><file name="Exception.php" hash="69d108ee3bd1abefe5bdbc545d3d9f33"/><dir name="Helper"><file name="Addresses.php" hash="bde92caa00a1e1ef6fea6e4c2fbd1a79"/><dir name="Catalog"><dir name="Product"><file name="Composite.php" hash="261174e58c58172849e0288ca11912b2"/><dir name="Edit"><dir name="Action"><file name="Attribute.php" hash="fed567cdfa0fff9a684eedb7b25f66d8"/></dir></dir></dir></dir><file name="Catalog.php" hash="5e98e70f14a850ca5092079c6148703e"/><dir name="Dashboard"><file name="Abstract.php" hash="2c2b8f5183e07c64e561b7d31fee0457"/><file name="Data.php" hash="b9e687f31e617786523d2c0627edc9cb"/><file name="Order.php" hash="aed42e5e47bfe8a41377be241371bf0b"/></dir><file name="Data.php" hash="40f042811e9a6d8cbfb9ba63c49470de"/><file name="Js.php" hash="8282f5d21e76b5b75ab0fd2f5854bda3"/><dir name="Media"><file name="Js.php" hash="d233bf73190efbcbdda7b038250ad58b"/></dir><file name="Rss.php" hash="28ca908c6c739fbd5e7f2b16ade3df59"/><file name="Sales.php" hash="809dda967d34ac01f2507e06649101be"/></dir><dir name="Model"><dir name="Config"><file name="Data.php" hash="fc78e857a6ed892286071cf0b85d7ad1"/></dir><file name="Config.php" hash="52074ba07928ab6b07d372cc474659b7"/><dir name="Customer"><dir name="Renderer"><file name="Region.php" hash="54ea22f5b0f063ab25c809d068005968"/></dir></dir><dir name="Email"><file name="Template.php" hash="e6dc2b4312754a24944f3ea686b664d0"/></dir><file name="Extension.php" hash="e033d92cfe37b6a219e6ea49a677d3ff"/><dir name="Giftmessage"><file name="Save.php" hash="dbf8760ae4c8a0c7519593628977d856"/></dir><dir name="LayoutUpdate"><file name="Validator.php" hash="e91d93c2d850f40c42ff3e38d7e5aff1"/></dir><dir name="Newsletter"><dir name="Renderer"><file name="Text.php" hash="c4d306f625f721c5525a18867d48cda5"/></dir></dir><file name="Observer.php" hash="65832c54177e231963266895f9968dc2"/><dir name="Report"><file name="Item.php" hash="bcf980f26e8c0a45e2369215a76ba106"/></dir><dir name="Sales"><dir name="Order"><file name="Create.php" hash="1396133fae0fce77501b7215bb4091ca"/><file name="Random.php" hash="44e7477e5a01710ee2cd41f8cda07d16"/></dir><file name="Order.php" hash="4a745e3563a62f6db3f84b353f9676ed"/></dir><dir name="Search"><file name="Catalog.php" hash="7c7582e8324ceb907de74ddb0ae42ecd"/><file name="Customer.php" hash="f1f36d5389447155225ce27f1139b736"/><file name="Order.php" hash="6c938d5565c33dd4c4c38420eb43fe8d"/></dir><dir name="Session"><file name="Quote.php" hash="de3113a5d1a529931db95d5068e54b92"/></dir><file name="Session.php" hash="553fcace1933d96adb0bcc970a5c59d1"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Admin"><file name="Custompath.php" hash="5942309a56bbcb7fd1983f8fa3556b17"/><file name="Custom.php" hash="430667fb816b5e54b50f70d25d7f6321"/><file name="Observer.php" hash="c7892b3be04781d752279fe0a4643c63"/><dir name="Password"><dir name="Link"><file name="Expirationperiod.php" hash="c111d27bb8f96a7ee95b79fb509e6665"/></dir></dir><file name="Usecustompath.php" hash="a8fc9ab6d911ce3b792f3fa673603581"/><file name="Usecustom.php" hash="0320a50fb472d5177f4cf5079a2febb7"/><file name="Usesecretkey.php" hash="a8a6e3d743ee52feb752d1bc2a87473d"/></dir><file name="Baseurl.php" hash="4b8229a26e622f6b05c4b89a2111d1d3"/><file name="Cache.php" hash="faba159558453c47f1ff8cb9b7c0c99b"/><dir name="Catalog"><dir name="Inventory"><file name="Managestock.php" hash="386bbced868078f229f89c5ca7b0dd2f"/></dir><dir name="Search"><file name="Type.php" hash="25f69a094faca6832a067ced53c95d75"/></dir></dir><file name="Category.php" hash="4a22c1377538d2e3aac58fcc4e3ff505"/><file name="Cookie.php" hash="7f2e830fdb3a65fdc33a4df1e2e2f825"/><dir name="Currency"><file name="Abstract.php" hash="621878f6cb098464011635cd938d3a73"/><file name="Allow.php" hash="7de02afe7ca6b20a8089ec181e90f8a1"/><file name="Base.php" hash="f95ad1c06bcc2e2a317be890b5708d94"/><file name="Cron.php" hash="331f7fa5655edb36a9c36c5c6977f821"/><file name="Default.php" hash="6355a28f04df59520038bbf0b99775de"/></dir><dir name="Customer"><dir name="Address"><file name="Street.php" hash="f2f86a1d2c745149dec47540b686142f"/></dir><dir name="Password"><dir name="Link"><file name="Expirationperiod.php" hash="075ff1ff57cf1fc8597ffb2de563cdbe"/></dir></dir><dir name="Show"><file name="Address.php" hash="c4e6cc0eb67c29c41de9e45d611656ce"/><file name="Customer.php" hash="ffdc8cc46e9aa5de2c66d8a3b5a199c9"/></dir></dir><file name="Datashare.php" hash="c4be86d5d75af0b7b837b4866c5eeb6c"/><dir name="Design"><file name="Exception.php" hash="12ef1288d47309070a56e0ddc8e2d1f3"/><file name="Package.php" hash="0f5bf9bb16f7c9175d6fc93b5f08cf05"/></dir><dir name="Email"><file name="Address.php" hash="06b526b38882c7bf28a0533b95d6ffd5"/><file name="Logo.php" hash="f5326822d8d520583b82466de0879e7a"/><file name="Sender.php" hash="065a8a57815502adef5610b2846a1533"/></dir><file name="Encrypted.php" hash="c37c71c323901bc16ab10e1e0d702f7e"/><file name="Filename.php" hash="5953e5bd17e3e1094d67a0ed49636d2d"/><file name="File.php" hash="dbb99074253f65a73e53b164e56ad7e0"/><dir name="Image"><file name="Favicon.php" hash="1b6adb473d15fe0c0458be72445a7cc1"/><file name="Pdf.php" hash="eedfa1e0d51e95cbd4d425dbd860fbd0"/></dir><file name="Image.php" hash="08b2ff9ce47d4bfc2042f2c9d2f94063"/><dir name="Layer"><file name="Children.php" hash="24507527b224f7bb022f5f916785afdd"/></dir><dir name="Locale"><file name="Timezone.php" hash="40ca91bb8ac2e0d9729dc787c687f351"/></dir><file name="Locale.php" hash="a386e2ebc0a1ef6298ba117cb0fd69b2"/><dir name="Log"><file name="Cron.php" hash="a24f33aa740b960c44d33b39eb7028f7"/></dir><dir name="Price"><file name="Scope.php" hash="18b19a409fb134e026960faa5131bb80"/></dir><dir name="Product"><dir name="Alert"><file name="Cron.php" hash="27c88d2a4a857ae29de6f1bad60c9b5b"/></dir></dir><file name="Secure.php" hash="4262bf6375d779d6b1788b1c8c6580c2"/><dir name="Seo"><file name="Product.php" hash="f91ae68b2ea4b655db6dd229723766a0"/></dir><dir name="Serialized"><file name="Array.php" hash="f05603ace2c4a884ee55042e7798a646"/></dir><file name="Serialized.php" hash="1f3f3d4addc465d580e15cb3670633bf"/><dir name="Shipping"><file name="Tablerate.php" hash="5a75c810e3a52e37abbfa8356b4e8a7d"/></dir><dir name="Sitemap"><file name="Cron.php" hash="e458eb34cd129ece45d82d146cd9254f"/></dir><file name="Sitemap.php" hash="cbe0c11c58c8fcc7c7c55a8b8462b77f"/><dir name="Storage"><dir name="Media"><file name="Database.php" hash="9a205727553c6813645241cf594985e0"/></dir></dir><file name="Store.php" hash="6adebc9bb0beefebb81df2bc87bc7318"/><file name="Translate.php" hash="172246c2719804b26b048cbeae024456"/></dir><dir name="Clone"><dir name="Media"><file name="Image.php" hash="5daa8ac4983dace294e7615aa2eee6f7"/></dir></dir><dir name="Source"><dir name="Admin"><file name="Page.php" hash="f9a0c57db9c272f4cf18c6a8deeae617"/></dir><file name="Allregion.php" hash="ab2f8099ce326cb1fb263b5d2e84216b"/><dir name="Catalog"><file name="GridPerPage.php" hash="d281112f7422328718a1f24ad4dd8439"/><file name="ListMode.php" hash="cfa54a3823ae764782441edb2511b384"/><file name="ListPerPage.php" hash="b366a5917dbaa701f74dc457ca26e724"/><file name="ListSort.php" hash="483b463d3e8a7b234bcf9016202bd295"/><dir name="Search"><file name="Type.php" hash="7eed563a21cd34e2204983afb31bf99f"/></dir><file name="TimeFormat.php" hash="b6e5d76f85d99c72d311c62762b7883e"/></dir><file name="Category.php" hash="e8be2455d37599676e3683a49971daab"/><file name="Checktype.php" hash="ad88f0b215c461362846f5cc6cb8b693"/><dir name="Cms"><file name="Page.php" hash="1bc5df99c611471d2efffe5f158d54a0"/><dir name="Wysiwyg"><file name="Enabled.php" hash="793bdff1fc42bacbe635801940ef8815"/></dir></dir><dir name="Country"><file name="Full.php" hash="26477d2ded04c1cdce70b19af203d389"/></dir><file name="Country.php" hash="a20c5900136e7a57cb17f2a13d9c890a"/><dir name="Cron"><file name="Frequency.php" hash="7684a98dff8855d0101f61017ccb8bbf"/></dir><dir name="Currency"><file name="Service.php" hash="9f55c5675dff6d66e7d2586f83cdcdf9"/></dir><file name="Currency.php" hash="00ec327bdddc1346b4be5b30ad6bec35"/><dir name="Customer"><dir name="Address"><file name="Type.php" hash="8f71303d7d65a8199735a6b013d12ea8"/></dir><dir name="Group"><file name="Multiselect.php" hash="83c5c6431652e81244e5dc37a0cea612"/></dir><file name="Group.php" hash="7ba64224f9eadca13829a2c8f8f1c51d"/></dir><dir name="Date"><file name="Short.php" hash="49d896d54154b2ef5cc8e9a598e94cad"/></dir><dir name="Design"><file name="Package.php" hash="fba07b7815732fb98652a7de2f59d061"/><file name="Robots.php" hash="928cb6b78e80f23f56a1b77f9c2e06b3"/></dir><dir name="Dev"><file name="Dbautoup.php" hash="abfbfff2f1696c58b3499de6f4b3bf1b"/></dir><dir name="Email"><file name="Identity.php" hash="03fbedd442d1e2fcc9adf6f0824e8d8c"/><file name="Method.php" hash="b864d853e871e6b3c3859ea6389009de"/><file name="Smtpauth.php" hash="1a259e7cd590dd160abd453ef82b9e06"/><file name="Template.php" hash="3f07eabd2707fe20290d46dce039fba2"/></dir><file name="Enabledisable.php" hash="7cbbb723d4311d348b582d9de5a8be1a"/><file name="Frequency.php" hash="7455078214654c342097336f53240cc3"/><file name="Language.php" hash="d9a2dc84d1deec2504c56a0d77fdc2f1"/><dir name="Locale"><file name="Country.php" hash="03b8d1369cba6dc2fad68d5b9a174e75"/><dir name="Currency"><file name="All.php" hash="98d087b2b6b2e6815f7c838be87107d9"/></dir><file name="Currency.php" hash="9a165c18a5ba4361d35dc28f0ef19737"/><file name="Timezone.php" hash="f69fc68327ce9f94f36892f8f51cbf34"/><file name="Weekdaycodes.php" hash="adc5d102c7ece4e8efee9f576b7b1526"/><file name="Weekdays.php" hash="f5853e71eaee555f697a9f99065ae45f"/></dir><file name="Locale.php" hash="5c32fb7c03f4597e35004fc07ce1ce09"/><file name="Nooptreq.php" hash="4b7fdfd06d7008b6fc1da9f41b0bc442"/><dir name="Notification"><file name="Frequency.php" hash="31152cf1dba8de0845e822436df293c0"/></dir><dir name="Order"><dir name="Status"><file name="New.php" hash="4aca62dfb10891fa82bf06a68b1f4748"/><file name="Newprocessing.php" hash="c6beb7667d09a698d11a8e1ba72901e7"/><file name="Processing.php" hash="db0eae4039f5e23c6f28080a7a74221b"/></dir><file name="Status.php" hash="af51dc72091bb0371cd18447b8befbe0"/></dir><dir name="Payment"><file name="Allmethods.php" hash="da36ab1c4724d0385de95ec26e32afa6"/><file name="Allowedmethods.php" hash="9ec8978b16fa48692a3fbc1f94def4a0"/><file name="Allspecificcountries.php" hash="3357331e9beb25b8c34f094b05dd9319"/><file name="Cctype.php" hash="71e99f1d3ffc08ebfb3c3ab45c68dd4b"/></dir><dir name="Price"><file name="Scope.php" hash="4dd719340685a5f4562d98a4d3e97326"/><file name="Step.php" hash="ad3154f6ca7bcc004fa2280c51fde745"/></dir><dir name="Product"><dir name="Options"><file name="Price.php" hash="afa82dabfe8f30fd6576e2709739092b"/><file name="Type.php" hash="20b64ff04837819b1536b99fad579d70"/></dir><file name="Thumbnail.php" hash="bc1267f7c8e6b87934333b6ab1eb5abb"/></dir><dir name="Reports"><file name="Scope.php" hash="711afa6dec984311df82ca9afc1741c1"/></dir><dir name="Shipping"><file name="Allmethods.php" hash="f176857c49a6e97ecf646da639a79ea8"/><file name="Allowedmethods.php" hash="22492392525bed28af6d81eb141ef72c"/><file name="Allspecificcountries.php" hash="6eb3ebd0b85d78f03bba20409e8b55b2"/><file name="Flatrate.php" hash="6d7536de960ec439dd70385e583eb2be"/><file name="Tablerate.php" hash="6c439f4d0f9b2deaa3134f5231a02610"/><file name="Taxclass.php" hash="b25b1092a002c9692deb3e1444424a78"/></dir><dir name="Storage"><dir name="Media"><file name="Database.php" hash="dde851839f43a997e935b30fe953f04c"/><file name="Storage.php" hash="9a082b13981dead6103a18b6d0845863"/></dir></dir><file name="Store.php" hash="8433d131816c0aa1accdfbed1364ccfd"/><dir name="Tax"><dir name="Apply"><file name="On.php" hash="93e776dacc0803f7ef49e407cec37b81"/></dir><file name="Basedon.php" hash="72b88f1c39bd6b8049445ff9cbb3bb91"/><file name="Catalog.php" hash="d946fce1b89d627574c59b9fc54a1bd6"/></dir><dir name="Watermark"><file name="Position.php" hash="d6114250a47a4e690b477b30e2fac6cf"/></dir><dir name="Web"><file name="Protocol.php" hash="087447e01697f12a29971a164c3ada31"/><file name="Redirect.php" hash="8889b88265efa5bb9f51b310a5ed0611"/></dir><file name="Website.php" hash="9961cff233d7cf243d87d5446769130f"/><file name="Yesnocustom.php" hash="621fe7ccca08100c114d7aa29ee635bc"/><file name="Yesno.php" hash="2a033b5968617136021cdd5d631896fd"/></dir></dir><file name="Store.php" hash="245ea02c8e0de759d6c569357d9e0859"/></dir><file name="Url.php" hash="0df084e1de17a1e756f9e5c6a2a1f53c"/></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_Adminhtml.csv" hash="e3901acde204f924baf932a72ba0e27a"/></dir></target></contents>
16
  <compatible/>
17
+ <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package><package><name>Lib_Js_Calendar</name><channel>community</channel><min>1.51.1.1</min><max>1.52</max></package><package><name>Lib_Js_Ext</name><channel>community</channel><min>1.7.0.0</min><max>1.8.0.0</max></package><package><name>Lib_LinLibertineFont</name><channel>community</channel><min>2.8.14.1</min><max>2.9.0.0</max></package><package><name>Lib_Js_TinyMCE</name><channel>community</channel><min>3.4.7.0</min><max>3.5.0.0</max></package></required></dependencies>
18
  </package>