Mage_Core_Adminhtml - Version 1.7.0.0

Version Notes

1.7.0.0

Download this release

Release Info

Developer Magento Core Team
Extension Mage_Core_Adminhtml
Version 1.7.0.0
Comparing to
See all releases


Code changes from version 1.6.2.0 to 1.7.0.0

Files changed (1037) 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 +4 -2
  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 +11 -1
  14. app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php +1 -1
  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 +57 -9
  22. app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php +53 -0
  23. app/code/core/Mage/Adminhtml/Block/Backup/Grid.php +53 -19
  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 +1 -1
  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 +5 -2
  35. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php +1 -1
  36. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php +1 -1
  37. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php +3 -1
  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 +1 -1
  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 +1 -1
  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 +5 -4
  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 +17 -12
  49. app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php +4 -3
  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 +1 -1
  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 +21 -20
  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 +2 -2
  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 +1 -1
  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 +9 -3
  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 +50 -36
  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 +76 -22
  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 +11 -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 +1 -1
  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 +96 -0
  107. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php +347 -0
  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 +15 -287
  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 +23 -2
  114. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php +1 -1
  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 +11 -9
  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 +45 -6
  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 +42 -6
  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 +7 -9
  134. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php +3 -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 +46 -0
  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 +3 -3
  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 +1 -1
  145. app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php +26 -31
  146. app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php +1 -1
  147. app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php +2 -2
  148. app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php +2 -2
  149. app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php +4 -2
  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 +1 -1
  153. app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php +7 -3
  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 +16 -13
  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 +1 -1
  161. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php +5 -3
  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 +1 -1
  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 +105 -0
  176. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php +1 -1
  177. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php +19 -12
  178. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php +57 -13
  179. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php +4 -1
  180. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php +12 -2
  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 +10 -3
  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 +16 -6
  192. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php +4 -8
  193. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php +1 -1
  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 +1 -1
  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 +3 -5
  198. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php +13 -6
  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 +1 -1
  209. app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php +2 -3
  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 +98 -0
  218. app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php +79 -0
  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 +1 -1
  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 +5 -4
  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 +19 -11
  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 +10 -10
  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 +33 -1
  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 +11 -1
  298. app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php +1 -1
  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 +1 -1
  307. app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php +1 -1
  308. app/code/core/Mage/Adminhtml/Block/Poll/Edit.php +1 -1
  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 +3 -2
  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 +24 -33
  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 +25 -35
  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 +48 -11
  327. app/code/core/Mage/Adminhtml/Block/Promo/Quote.php +1 -1
  328. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php +23 -30
  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 +88 -0
  333. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php +146 -0
  334. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php +145 -0
  335. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php +42 -0
  336. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php +4 -1
  337. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php +52 -30
  338. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php +59 -0
  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 +47 -9
  341. app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php +5 -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 +1 -1
  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 +45 -46
  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 +13 -2
  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 +2 -2
  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 +6 -3
  359. app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php +8 -2
  360. app/code/core/Mage/Adminhtml/Block/Report/Grid.php +15 -3
  361. app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php +53 -6
  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 +84 -0
  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 +9 -6
  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 +17 -1
  379. app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php +72 -27
  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 +8 -2
  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 +3 -2
  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 +40 -7
  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 +8 -4
  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 +8 -4
  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 +64 -50
  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 +10 -5
  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 +5 -3
  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 +24 -21
  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 +7 -5
  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 +7 -4
  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 +1 -1
  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 +1 -1
  418. app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php +1 -1
  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 +1 -1
  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 +8 -5
  427. app/code/core/Mage/Adminhtml/Block/Review/Edit.php +1 -1
  428. app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php +9 -9
  429. app/code/core/Mage/Adminhtml/Block/Review/Grid.php +27 -9
  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 +9 -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 +17 -11
  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 +2 -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 +1 -1
  458. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php +1 -1
  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 +2 -2
  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 +25 -4
  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 +1 -1
  471. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php +49 -9
  472. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php +13 -1
  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 +4 -3
  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 +2 -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 +23 -2
  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 -8
  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 +6 -5
  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 +4 -12
  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 +3 -2
  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 +15 -2
  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 +4 -3
  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 +3 -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 +1 -1
  549. app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php +2 -2
  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 +10 -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 +104 -26
  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 +2 -5
  571. app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php +3 -2
  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 +5 -3
  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 +1 -1
  580. app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php +1 -1
  581. app/code/core/Mage/Adminhtml/Block/Store/Switcher.php +53 -2
  582. app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php +83 -0
  583. app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php +84 -0
  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 +11 -5
  591. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php +1 -1
  592. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php +1 -1
  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 +1 -1
  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 +12 -9
  605. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php +8 -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 +10 -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 +3 -3
  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 +1 -1
  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 +1 -1
  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 +1 -1
  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 +4 -2
  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 +6 -4
  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 +9 -10
  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 +5 -4
  649. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php +16 -7
  650. app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php +1 -1
  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 +10 -4
  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 +6 -3
  658. app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php +6 -3
  659. app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php +7 -3
  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 +1 -1
  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 +1 -1
  668. app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php +1 -1
  669. app/code/core/Mage/Adminhtml/Block/Tag/Edit.php +1 -1
  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 +11 -5
  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 +1 -1
  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 +1 -1
  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 +1 -1
  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 +74 -115
  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 +1 -1
  701. app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php +1 -1
  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 +3 -1
  708. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php +1 -1
  709. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php +1 -1
  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 +5 -3
  717. app/code/core/Mage/Adminhtml/Block/Widget/Container.php +1 -1
  718. app/code/core/Mage/Adminhtml/Block/Widget/Form.php +3 -4
  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 -6
  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 +3 -2
  726. app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +40 -10
  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 +1 -1
  733. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php +1 -1
  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 +25 -10
  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 +2 -11
  744. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php +13 -11
  745. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php +31 -5
  746. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php +4 -3
  747. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php +6 -3
  748. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php +21 -3
  749. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php +11 -7
  750. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php +9 -6
  751. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php +4 -3
  752. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php +15 -2
  753. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php +5 -1
  754. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php +6 -5
  755. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php +33 -8
  756. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php +15 -4
  757. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php +8 -8
  758. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php +21 -4
  759. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php +13 -6
  760. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php +8 -5
  761. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php +5 -4
  762. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php +9 -8
  763. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php +4 -3
  764. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php +9 -6
  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 +14 -13
  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 +16 -4
  777. app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php +124 -0
  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 +1 -1
  790. app/code/core/Mage/Adminhtml/Helper/Js.php +1 -1
  791. app/code/core/Mage/Adminhtml/Helper/Media/Js.php +3 -2
  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 -1
  796. app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php +1 -1
  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 +2 -4
  805. app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php +109 -43
  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 -12
  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 +5 -5
  816. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php +26 -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 +37 -0
  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 +5 -5
  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 +95 -0
  839. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php +1 -1
  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 +27 -6
  842. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php +37 -0
  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 +2 -2
  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 +5 -6
  848. app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php +15 -2
  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 +4 -3
  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 +48 -0
  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 +50 -0
  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 +4 -5
  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/Weekdays.php +1 -1
  900. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php +1 -1
  901. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php +1 -1
  902. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php +1 -1
  903. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php +1 -1
  904. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php +1 -1
  905. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php +1 -1
  906. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php +1 -1
  907. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php +1 -1
  908. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php +1 -1
  909. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php +1 -1
  910. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php +1 -1
  911. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php +6 -2
  912. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php +1 -1
  913. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php +7 -4
  914. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php +1 -1
  915. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php +1 -1
  916. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php +1 -1
  917. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php +1 -1
  918. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php +1 -1
  919. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php +1 -1
  920. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php +1 -1
  921. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php +1 -1
  922. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php +1 -1
  923. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php +1 -1
  924. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php +1 -1
  925. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php +1 -1
  926. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php +1 -1
  927. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php +1 -1
  928. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php +1 -1
  929. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php +1 -1
  930. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Redirect.php +1 -1
  931. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php +1 -1
  932. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php +14 -1
  933. app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php +1 -1
  934. app/code/core/Mage/Adminhtml/Model/System/Store.php +2 -2
  935. app/code/core/Mage/Adminhtml/Model/Url.php +1 -1
  936. app/code/core/Mage/Adminhtml/controllers/AjaxController.php +1 -1
  937. app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php +1 -1
  938. app/code/core/Mage/Adminhtml/controllers/Api/UserController.php +1 -1
  939. app/code/core/Mage/Adminhtml/controllers/CacheController.php +1 -1
  940. app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php +1 -1
  941. app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php +18 -8
  942. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php +12 -4
  943. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php +4 -21
  944. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php +1 -1
  945. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php +6 -1
  946. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php +1 -1
  947. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php +4 -2
  948. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php +1 -1
  949. app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php +1 -1
  950. app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php +24 -10
  951. app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php +2 -4
  952. app/code/core/Mage/Adminhtml/controllers/CatalogController.php +1 -1
  953. app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php +6 -4
  954. app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php +1 -1
  955. app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php +1 -1
  956. app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php +1 -1
  957. app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php +1 -1
  958. app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php +1 -1
  959. app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php +1 -1
  960. app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php +1 -1
  961. app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php +1 -1
  962. app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php +12 -7
  963. app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php +1 -1
  964. app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php +91 -0
  965. app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php +1 -1
  966. app/code/core/Mage/Adminhtml/controllers/CustomerController.php +82 -73
  967. app/code/core/Mage/Adminhtml/controllers/DashboardController.php +19 -4
  968. app/code/core/Mage/Adminhtml/controllers/IndexController.php +28 -37
  969. app/code/core/Mage/Adminhtml/controllers/JsonController.php +1 -1
  970. app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php +1 -1
  971. app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php +1 -1
  972. app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php +1 -1
  973. app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php +1 -1
  974. app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php +3 -7
  975. app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php +1 -1
  976. app/code/core/Mage/Adminhtml/controllers/NotificationController.php +1 -1
  977. app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php +3 -3
  978. app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php +16 -7
  979. app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php +1 -1
  980. app/code/core/Mage/Adminhtml/controllers/PollController.php +1 -1
  981. app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php +42 -10
  982. app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php +148 -15
  983. app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php +1 -1
  984. app/code/core/Mage/Adminhtml/controllers/PromoController.php +1 -1
  985. app/code/core/Mage/Adminhtml/controllers/RatingController.php +15 -10
  986. app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php +1 -1
  987. app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php +26 -24
  988. app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php +1 -1
  989. app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php +8 -67
  990. app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php +1 -1
  991. app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php +8 -7
  992. app/code/core/Mage/Adminhtml/controllers/Report/TagController.php +1 -1
  993. app/code/core/Mage/Adminhtml/controllers/ReportController.php +1 -1
  994. app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php +1 -1
  995. app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php +1 -1
  996. app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php +1 -1
  997. app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php +1 -1
  998. app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php +1 -1
  999. app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php +32 -5
  1000. app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php +1 -1
  1001. app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php +18 -19
  1002. app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php +1 -1
  1003. app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php +14 -11
  1004. app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php +1 -1
  1005. app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php +1 -1
  1006. app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php +15 -4
  1007. app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php +1 -1
  1008. app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php +1 -1
  1009. app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php +7 -5
  1010. app/code/core/Mage/Adminhtml/controllers/SalesController.php +1 -1
  1011. app/code/core/Mage/Adminhtml/controllers/SitemapController.php +1 -1
  1012. app/code/core/Mage/Adminhtml/controllers/SurveyController.php +1 -1
  1013. app/code/core/Mage/Adminhtml/controllers/System/AccountController.php +1 -1
  1014. app/code/core/Mage/Adminhtml/controllers/System/BackupController.php +251 -31
  1015. app/code/core/Mage/Adminhtml/controllers/System/CacheController.php +1 -1
  1016. app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php +1 -1
  1017. app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php +6 -1
  1018. app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php +1 -1
  1019. app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php +1 -1
  1020. app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php +5 -3
  1021. app/code/core/Mage/Adminhtml/controllers/System/DesignController.php +1 -1
  1022. app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php +1 -1
  1023. app/code/core/Mage/Adminhtml/controllers/System/StoreController.php +4 -1
  1024. app/code/core/Mage/Adminhtml/controllers/System/VariableController.php +5 -3
  1025. app/code/core/Mage/Adminhtml/controllers/SystemController.php +1 -1
  1026. app/code/core/Mage/Adminhtml/controllers/TagController.php +10 -8
  1027. app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php +1 -1
  1028. app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php +1 -1
  1029. app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php +1 -4
  1030. app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php +5 -20
  1031. app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php +1 -6
  1032. app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php +1 -1
  1033. app/code/core/Mage/Adminhtml/etc/adminhtml.xml +1 -1
  1034. app/code/core/Mage/Adminhtml/etc/config.xml +12 -1
  1035. app/code/core/Mage/Adminhtml/etc/jstranslator.xml +65 -0
  1036. app/locale/en_US/Mage_Adminhtml.csv +83 -27
  1037. 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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
@@ -38,7 +38,9 @@ class Mage_Adminhtml_Block_Api_Tab_Rolesedit extends Mage_Adminhtml_Block_Widget
38
$selrids = array();
39
40
foreach ($rules_set->getItems() as $item) {
41
- if (array_key_exists(strtolower($item->getResource_id()), $resources) && $item->getPermission() == 'allow') {
42
$resources[$item->getResource_id()]['checked'] = true;
43
array_push($selrids, $item->getResource_id());
44
}
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
38
$selrids = array();
39
40
foreach ($rules_set->getItems() as $item) {
41
+ if (array_key_exists(strtolower($item->getResource_id()), $resources)
42
+ && $item->getApiPermission() == 'allow')
43
+ {
44
$resources[$item->getResource_id()]['checked'] = true;
45
array_push($selrids, $item->getResource_id());
46
}
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 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) 2012 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) 2011 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,4 +42,14 @@ class Mage_Adminhtml_Block_Api_User extends Mage_Adminhtml_Block_Widget_Grid_Con
42
parent::__construct();
43
}
44
45
}
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 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
parent::__construct();
43
}
44
45
+ /**
46
+ * Prepare output HTML
47
+ *
48
+ * @return string
49
+ */
50
+ protected function _toHtml()
51
+ {
52
+ Mage::dispatchEvent('api_user_html_before', array('block' => $this));
53
+ return parent::_toHtml();
54
+ }
55
}
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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/Form.php CHANGED
@@ -20,7 +20,7 @@
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 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,14 +31,14 @@
31
* @package Mage_Adminhtml
32
* @author Magento Core Team <core@magentocommerce.com>
33
*/
34
-
35
class Mage_Adminhtml_Block_Backup extends Mage_Adminhtml_Block_Template
36
{
37
- public function __construct()
38
- {
39
- parent::__construct();
40
- $this->setTemplate('backup/list.phtml');
41
- }
42
43
protected function _prepareLayout()
44
{
@@ -46,14 +46,32 @@ class Mage_Adminhtml_Block_Backup extends Mage_Adminhtml_Block_Template
46
$this->setChild('createButton',
47
$this->getLayout()->createBlock('adminhtml/widget_button')
48
->setData(array(
49
- 'label' => Mage::helper('backup')->__('Create Backup'),
50
- 'onclick' => "window.location.href='" . $this->getUrl('*/*/create') . "'",
51
'class' => 'task'
52
))
53
);
54
$this->setChild('backupsGrid',
55
$this->getLayout()->createBlock('adminhtml/backup_grid')
56
);
57
}
58
59
public function getCreateButtonHtml()
@@ -61,8 +79,38 @@ class Mage_Adminhtml_Block_Backup extends Mage_Adminhtml_Block_Template
61
return $this->getChildHtml('createButton');
62
}
63
64
public function getGridHtml()
65
{
66
return $this->getChildHtml('backupsGrid');
67
}
68
}
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 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
class Mage_Adminhtml_Block_Backup extends Mage_Adminhtml_Block_Template
35
{
36
+ /**
37
+ * Block's template
38
+ *
39
+ * @var string
40
+ */
41
+ protected $_template = 'backup/list.phtml';
42
43
protected function _prepareLayout()
44
{
46
$this->setChild('createButton',
47
$this->getLayout()->createBlock('adminhtml/widget_button')
48
->setData(array(
49
+ 'label' => Mage::helper('backup')->__('Database Backup'),
50
+ 'onclick' => "return backup.backup('" . Mage_Backup_Helper_Data::TYPE_DB . "')",
51
'class' => 'task'
52
))
53
);
54
+ $this->setChild('createSnapshotButton',
55
+ $this->getLayout()->createBlock('adminhtml/widget_button')
56
+ ->setData(array(
57
+ 'label' => Mage::helper('backup')->__('System Backup'),
58
+ 'onclick' => "return backup.backup('" . Mage_Backup_Helper_Data::TYPE_SYSTEM_SNAPSHOT . "')",
59
+ 'class' => ''
60
+ ))
61
+ );
62
+ $this->setChild('createMediaBackupButton',
63
+ $this->getLayout()->createBlock('adminhtml/widget_button')
64
+ ->setData(array(
65
+ 'label' => Mage::helper('backup')->__('Database and Media Backup'),
66
+ 'onclick' => "return backup.backup('" . Mage_Backup_Helper_Data::TYPE_MEDIA . "')",
67
+ 'class' => ''
68
+ ))
69
+ );
70
$this->setChild('backupsGrid',
71
$this->getLayout()->createBlock('adminhtml/backup_grid')
72
);
73
+
74
+ $this->setChild('dialogs', $this->getLayout()->createBlock('adminhtml/backup_dialogs'));
75
}
76
77
public function getCreateButtonHtml()
79
return $this->getChildHtml('createButton');
80
}
81
82
+ /**
83
+ * Generate html code for "Create System Snapshot" button
84
+ *
85
+ * @return string
86
+ */
87
+ public function getCreateSnapshotButtonHtml()
88
+ {
89
+ return $this->getChildHtml('createSnapshotButton');
90
+ }
91
+
92
+ /**
93
+ * Generate html code for "Create Media Backup" button
94
+ *
95
+ * @return string
96
+ */
97
+ public function getCreateMediaBackupButtonHtml()
98
+ {
99
+ return $this->getChildHtml('createMediaBackupButton');
100
+ }
101
+
102
public function getGridHtml()
103
{
104
return $this->getChildHtml('backupsGrid');
105
}
106
+
107
+ /**
108
+ * Generate html code for pop-up messages that will appear when user click on "Rollback" link
109
+ *
110
+ * @return string
111
+ */
112
+ public function getDialogsHtml()
113
+ {
114
+ return $this->getChildHtml('dialogs');
115
+ }
116
}
app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.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) 2012 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
+ * Adminhtml rollback dialogs block
29
+ *
30
+ * @category Mage
31
+ * @package Mage_Adminhtml
32
+ * @author Magento Core Team <core@magentocommerce.com>
33
+ */
34
+ class Mage_Adminhtml_Block_Backup_Dialogs extends Mage_Adminhtml_Block_Template
35
+ {
36
+ /**
37
+ * Block's template
38
+ *
39
+ * @var string
40
+ */
41
+ protected $_template = 'backup/dialogs.phtml';
42
+
43
+ /**
44
+ * Include backup.js file in page before rendering
45
+ *
46
+ * @see Mage_Core_Block_Abstract::_prepareLayout()
47
+ */
48
+ protected function _prepareLayout()
49
+ {
50
+ $this->getLayout()->getBlock('head')->addJs('mage/adminhtml/backup.js');
51
+ parent::_prepareLayout();
52
+ }
53
+ }
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
@@ -51,8 +51,29 @@ class Mage_Adminhtml_Block_Backup_Grid extends Mage_Adminhtml_Block_Widget_Grid
51
return parent::_prepareCollection();
52
}
53
54
/**
55
* Configuration of grid
56
*/
57
protected function _prepareColumns()
58
{
@@ -62,45 +83,58 @@ class Mage_Adminhtml_Block_Backup_Grid extends Mage_Adminhtml_Block_Widget_Grid
62
'header' => Mage::helper('backup')->__('Time'),
63
'index' => 'date_object',
64
'type' => 'datetime',
65
));
66
67
$this->addColumn('size', array(
68
'header' => Mage::helper('backup')->__('Size, Bytes'),
69
'index' => 'size',
70
'type' => 'number',
71
- 'sortable' => false,
72
'filter' => false
73
));
74
75
$this->addColumn('type', array(
76
'header' => Mage::helper('backup')->__('Type'),
77
'type' => 'options',
78
- 'options' => array('db' => Mage::helper('backup')->__('DB')),
79
- 'index' =>'type'
80
));
81
82
$this->addColumn('download', array(
83
'header' => Mage::helper('backup')->__('Download'),
84
- 'format' => '<a href="' . $this->getUrl('*/*/download', array('time' => '$time', 'type' => '$type')) .'">gz</a> &nbsp; <small>('.$url7zip.')</small>',
85
'index' => 'type',
86
'sortable' => false,
87
'filter' => false
88
));
89
90
- $this->addColumn('action', array(
91
- 'header' => Mage::helper('backup')->__('Action'),
92
- 'type' => 'action',
93
- 'width' => '80px',
94
- 'filter' => false,
95
- 'sortable' => false,
96
- 'actions' => array(array(
97
- 'url' => $this->getUrl('*/*/delete', array('time' => '$time', 'type' => '$type')),
98
- 'caption' => Mage::helper('adminhtml')->__('Delete'),
99
- 'confirm' => Mage::helper('adminhtml')->__('Are you sure you want to do this?')
100
- )),
101
- 'index' => 'type',
102
- 'sortable' => false
103
- ));
104
105
return $this;
106
}
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
51
return parent::_prepareCollection();
52
}
53
54
+ /**
55
+ * Prepare mass action controls
56
+ *
57
+ * @return Mage_Adminhtml_Block_Backup_Grid
58
+ */
59
+ protected function _prepareMassaction()
60
+ {
61
+ $this->setMassactionIdField('id');
62
+ $this->getMassactionBlock()->setFormFieldName('ids');
63
+
64
+ $this->getMassactionBlock()->addItem('delete', array(
65
+ 'label'=> Mage::helper('adminhtml')->__('Delete'),
66
+ 'url' => $this->getUrl('*/*/massDelete'),
67
+ 'confirm' => Mage::helper('backup')->__('Are you sure you want to delete the selected backup(s)?')
68
+ ));
69
+
70
+ return $this;
71
+ }
72
+
73
/**
74
* Configuration of grid
75
+ *
76
+ * @return Mage_Adminhtml_Block_Backup_Grid
77
*/
78
protected function _prepareColumns()
79
{
83
'header' => Mage::helper('backup')->__('Time'),
84
'index' => 'date_object',
85
'type' => 'datetime',
86
+ 'width' => 200
87
+ ));
88
+
89
+ $this->addColumn('display_name', array(
90
+ 'header' => Mage::helper('backup')->__('Name'),
91
+ 'index' => 'display_name',
92
+ 'filter' => false,
93
+ 'sortable' => true,
94
+ 'width' => 350
95
));
96
97
$this->addColumn('size', array(
98
'header' => Mage::helper('backup')->__('Size, Bytes'),
99
'index' => 'size',
100
'type' => 'number',
101
+ 'sortable' => true,
102
'filter' => false
103
));
104
105
$this->addColumn('type', array(
106
'header' => Mage::helper('backup')->__('Type'),
107
'type' => 'options',
108
+ 'options' => Mage::helper('backup')->getBackupTypes(),
109
+ 'index' => 'type',
110
+ 'width' => 300
111
));
112
113
$this->addColumn('download', array(
114
'header' => Mage::helper('backup')->__('Download'),
115
+ 'format' => '<a href="' . $this->getUrl('*/*/download', array('time' => '$time', 'type' => '$type'))
116
+ . '">$extension</a> &nbsp; <small>('.$url7zip.')</small>',
117
'index' => 'type',
118
'sortable' => false,
119
'filter' => false
120
));
121
122
+ if (Mage::helper('backup')->isRollbackAllowed()){
123
+ $this->addColumn('action', array(
124
+ 'header' => Mage::helper('backup')->__('Action'),
125
+ 'type' => 'action',
126
+ 'width' => '80px',
127
+ 'filter' => false,
128
+ 'sortable' => false,
129
+ 'actions' => array(array(
130
+ 'url' => '#',
131
+ 'caption' => Mage::helper('backup')->__('Rollback'),
132
+ 'onclick' => 'return backup.rollback(\'$type\', \'$time\');'
133
+ )),
134
+ 'index' => 'type',
135
+ 'sortable' => false
136
+ ));
137
+ }
138
139
return $this;
140
}
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
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) 2011 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26
20
*
21
* @category Mage
22
* @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
*/
26