Mage_Core_Adminhtml - Version 1.7.0.0

app/code/core/Mage/Adminhtml/Block/Abstract.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/Buttons.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/Editroles.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/Edituser.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/Role.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/Roles.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php +4 -2

app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/User.php +11 -1

app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Api/Users.php +1 -1

app/code/core/Mage/Adminhtml/Block/Backup.php +57 -9

app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php +53 -0

app/code/core/Mage/Adminhtml/Block/Backup/Grid.php +53 -19

app/code/core/Mage/Adminhtml/Block/Cache.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cache/Additional.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cache/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php +5 -2

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php +3 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php +5 -4

app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php +17 -12

app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php +4 -3

app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php +21 -20

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php +2 -2

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php +9 -3

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php +50 -36

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php +76 -22

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php +11 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php +96 -0

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php +347 -0

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php +15 -287

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php +23 -2

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php +11 -9

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php +45 -6

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php +42 -6

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php +7 -9

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php +3 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php +46 -0

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Price.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php +3 -3

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Search.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php +26 -31

app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php +2 -2

app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php +2 -2

app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php +4 -2

app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Block.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php +7 -3

app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Page.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php +16 -13

app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php +5 -3

app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php +1 -1

app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php +105 -0

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php +19 -12

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php +57 -13

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php +4 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php +12 -2

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php +10 -3

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php +16 -6

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php +4 -8

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php +3 -5

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php +13 -6

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Group.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php +2 -3

app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Online.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php +1 -1

app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php +98 -0

app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php +79 -0

app/code/core/Mage/Adminhtml/Block/Dashboard.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php +1 -1

app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php +1 -1

app/code/core/Mage/Adminhtml/Block/Denied.php +1 -1

app/code/core/Mage/Adminhtml/Block/Html/Date.php +1 -1

app/code/core/Mage/Adminhtml/Block/Html/Select.php +1 -1

app/code/core/Mage/Adminhtml/Block/Media/Editor.php +1 -1

app/code/core/Mage/Adminhtml/Block/Media/Uploader.php +5 -4

app/code/core/Mage/Adminhtml/Block/Messages.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php +19 -11

app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php +1 -1

app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Notification/Baseurl.php +1 -1

app/code/core/Mage/Adminhtml/Block/Notification/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php +1 -1

app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php +1 -1

app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php +1 -1

app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php +1 -1

app/code/core/Mage/Adminhtml/Block/Notification/Security.php +1 -1

app/code/core/Mage/Adminhtml/Block/Notification/Survey.php +1 -1

app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php +1 -1

app/code/core/Mage/Adminhtml/Block/Notification/Window.php +10 -10

app/code/core/Mage/Adminhtml/Block/Page.php +1 -1

app/code/core/Mage/Adminhtml/Block/Page/Footer.php +1 -1

app/code/core/Mage/Adminhtml/Block/Page/Head.php +1 -1

app/code/core/Mage/Adminhtml/Block/Page/Header.php +1 -1

app/code/core/Mage/Adminhtml/Block/Page/Menu.php +33 -1

app/code/core/Mage/Adminhtml/Block/Page/Notices.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Role.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/User.php +11 -1

app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php +1 -1

app/code/core/Mage/Adminhtml/Block/Permissions/Users.php +1 -1

app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Poll/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php +1 -1

app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php +1 -1

app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php +3 -2

app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Poll/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Poll/Poll.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php +24 -33

app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Js.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php +25 -35

app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php +48 -11

app/code/core/Mage/Adminhtml/Block/Promo/Quote.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php +23 -30

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php +88 -0

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php +146 -0

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php +145 -0

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php +42 -0

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php +4 -1

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php +52 -30

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php +59 -0

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php +47 -9

app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php +5 -1

app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php +1 -1

app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php +1 -1

app/code/core/Mage/Adminhtml/Block/Rating/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php +45 -46

app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php +1 -1

app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Rating/Grid.php +13 -2

app/code/core/Mage/Adminhtml/Block/Rating/Rating.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php +2 -2

app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php +6 -3

app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php +8 -2

app/code/core/Mage/Adminhtml/Block/Report/Grid.php +15 -3

app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php +53 -6

app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php +84 -0

app/code/core/Mage/Adminhtml/Block/Report/Product.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php +9 -6

app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php +17 -1

app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php +72 -27

app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php +8 -2

app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php +3 -2

app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php +40 -7

app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php +8 -4

app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php +8 -4

app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php +64 -50

app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php +10 -5

app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php +5 -3

app/code/core/Mage/Adminhtml/Block/Report/Search.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php +24 -21

app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php +7 -5

app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php +7 -4

app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php +1 -1

app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Review/Add.php +1 -1

app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php +8 -5

app/code/core/Mage/Adminhtml/Block/Review/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php +9 -9

app/code/core/Mage/Adminhtml/Block/Review/Grid.php +27 -9

app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php +1 -1

app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php +1 -1

app/code/core/Mage/Adminhtml/Block/Review/Main.php +9 -1

app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php +1 -1

app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php +17 -11

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php +2 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php +2 -2

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php +25 -4

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php +49 -9

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php +13 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php +4 -3

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php +2 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php +23 -2

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php +1 -8

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php +6 -5

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php +4 -12

app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php +3 -2

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php +15 -2

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php +4 -3

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php +3 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php +2 -2

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php +10 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php +104 -26

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Totals.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php +2 -5

app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php +3 -2

app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sitemap.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php +5 -3

app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php +1 -1

app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php +1 -1

app/code/core/Mage/Adminhtml/Block/Store/Switcher.php +53 -2

app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php +83 -0

app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php +84 -0

app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form.php +11 -5

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php +12 -9

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php +8 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php +10 -1

app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php +3 -3

app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Currency.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Design.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php +4 -2

app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Email/Template.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php +6 -4

app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php +9 -10

app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php +5 -4

app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php +16 -7

app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php +10 -4

app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php +6 -3

app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php +6 -3

app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php +7 -3

app/code/core/Mage/Adminhtml/Block/System/Store/Store.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Variable.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Customer.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php +11 -5

app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Pending.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Product.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Tag.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Class.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php +74 -115

app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Rule.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php +1 -1

app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Template.php +1 -1

app/code/core/Mage/Adminhtml/Block/Text/List.php +1 -1

app/code/core/Mage/Adminhtml/Block/Urlrewrite.php +1 -1

app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php +1 -1

app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php +1 -1

app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php +3 -1

app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php +1 -1

app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php +1 -1

app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Button.php +5 -3

app/code/core/Mage/Adminhtml/Block/Widget/Container.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Form.php +3 -4

app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php +1 -6

app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php +3 -2

app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +40 -10

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php +25 -10

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php +2 -11

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php +13 -11

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php +31 -5

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php +4 -3

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php +6 -3

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php +21 -3

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php +11 -7

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php +9 -6

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php +4 -3

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php +15 -2

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php +5 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php +6 -5

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php +33 -8

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php +15 -4

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php +8 -8

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php +21 -4

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php +13 -6

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php +8 -5

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php +5 -4

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php +9 -8

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php +4 -3

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php +9 -6

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php +14 -13

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/Tree.php +1 -1

app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php +1 -1

app/code/core/Mage/Adminhtml/Controller/Action.php +16 -4

app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php +124 -0

app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php +1 -1

app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php +1 -1

app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php +1 -1

app/code/core/Mage/Adminhtml/Exception.php +1 -1

app/code/core/Mage/Adminhtml/Helper/Addresses.php +1 -1

app/code/core/Mage/Adminhtml/Helper/Catalog.php +1 -1

app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php +1 -1

app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php +1 -1

app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php +1 -1

app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php +1 -1

app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php +1 -1

app/code/core/Mage/Adminhtml/Helper/Data.php +1 -1

app/code/core/Mage/Adminhtml/Helper/Js.php +1 -1

app/code/core/Mage/Adminhtml/Helper/Media/Js.php +3 -2

app/code/core/Mage/Adminhtml/Helper/Rss.php +1 -1

app/code/core/Mage/Adminhtml/Helper/Sales.php +1 -1

app/code/core/Mage/Adminhtml/Model/Config.php +1 -1

app/code/core/Mage/Adminhtml/Model/Config/Data.php +3 -1

app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php +1 -1

app/code/core/Mage/Adminhtml/Model/Email/Template.php +1 -1

app/code/core/Mage/Adminhtml/Model/Extension.php +1 -1

app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php +1 -1

app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php +1 -1

app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php +1 -1

app/code/core/Mage/Adminhtml/Model/Observer.php +1 -1

app/code/core/Mage/Adminhtml/Model/Report/Item.php +1 -1

app/code/core/Mage/Adminhtml/Model/Sales/Order.php +2 -4

app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php +109 -43

app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php +1 -1

app/code/core/Mage/Adminhtml/Model/Search/Catalog.php +1 -1

app/code/core/Mage/Adminhtml/Model/Search/Customer.php +1 -1

app/code/core/Mage/Adminhtml/Model/Search/Order.php +1 -1

app/code/core/Mage/Adminhtml/Model/Session.php +1 -1

app/code/core/Mage/Adminhtml/Model/Session/Quote.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php +1 -12

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custompath.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Observer.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php +5 -5

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php +26 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cookie.php +37 -0

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Address/Street.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php +5 -5

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Address.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Customer.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Logo.php +95 -0

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php +27 -6

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php +37 -0

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php +2 -2

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php +5 -6

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php +15 -2

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Secure.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php +4 -3

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Checktype.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php +48 -0

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group/Multiselect.php +50 -0

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php +4 -5

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php +6 -2

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php +7 -4

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Redirect.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php +14 -1

app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php +1 -1

app/code/core/Mage/Adminhtml/Model/System/Store.php +2 -2

app/code/core/Mage/Adminhtml/Model/Url.php +1 -1

app/code/core/Mage/Adminhtml/controllers/AjaxController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Api/UserController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/CacheController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php +18 -8

app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php +12 -4

app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php +4 -21

app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php +6 -1

app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php +4 -2

app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php +24 -10

app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php +2 -4

app/code/core/Mage/Adminhtml/controllers/CatalogController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php +6 -4

app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php +12 -7

app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php +91 -0

app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/CustomerController.php +82 -73

app/code/core/Mage/Adminhtml/controllers/DashboardController.php +19 -4

app/code/core/Mage/Adminhtml/controllers/IndexController.php +28 -37

app/code/core/Mage/Adminhtml/controllers/JsonController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php +3 -7

app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/NotificationController.php +1 -1

app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php +3 -3

app/code/{core/Mage/Adminhtml/controllers/Permissions/UserController.php → core} +0 -0

	@@ -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	}


20	*
21	* @category Mage
22	* @package Mage_Adminhtml
23	+ * @copyright Copyright (c) 2012 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	}

@@ -20,7 +20,7 @@
+             *
              * @category    Mage
              * @package     Mage_Adminhtml
-            -
             * @copyright   Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
              * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
              */
@@ -31,14 +31,14 @@
              * @package    Mage_Adminhtml
              * @author      Magento Core Team <core@magentocommerce.com>
              */
-            -
             class Mage_Adminhtml_Block_Backup extends Mage_Adminhtml_Block_Template
+            {
-            -
                public function __construct()
-            -
                {
-            -
                    parent::__construct();
-            -
                    $this->setTemplate('backup/list.phtml');
-            -
                }
                 protected function _prepareLayout()
+                {
@@ -46,14 +46,32 @@ class Mage_Adminhtml_Block_Backup extends Mage_Adminhtml_Block_Template
                     $this->setChild('createButton',
                         $this->getLayout()->createBlock('adminhtml/widget_button')
                             ->setData(array(
-            -
                                'label' => Mage::helper('backup')->__('Create Backup'),
-            -
                                'onclick' => "window.location.href='" . $this->getUrl('*/*/create') . "'",
                                 'class'  => 'task'
                             ))
                     );
                     $this->setChild('backupsGrid',
                         $this->getLayout()->createBlock('adminhtml/backup_grid')
                     );
+                }
                 public function getCreateButtonHtml()
@@ -61,8 +79,38 @@ class Mage_Adminhtml_Block_Backup extends Mage_Adminhtml_Block_Template
                     return $this->getChildHtml('createButton');
+                }
                 public function getGridHtml()
+                {
                     return $this->getChildHtml('backupsGrid');
+                }
+            }


20	*
21	* @category Mage
22	* @package Mage_Adminhtml
23	+ * @copyright Copyright (c) 2012 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	}

Mage_Core_Adminhtml - Version 1.7.0.0

Version Notes

Release Info

Code changes from version 1.6.2.0 to 1.7.0.0

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


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	+ }